diff --git a/app/src/main/java/com/akseltorgard/devcalc/Calculator.java b/app/src/main/java/com/akseltorgard/devcalc/Calculator.java
index 927ec82..290a291 100644
--- a/app/src/main/java/com/akseltorgard/devcalc/Calculator.java
+++ b/app/src/main/java/com/akseltorgard/devcalc/Calculator.java
@@ -276,7 +276,7 @@ void setOperator(Operators.BinaryOperator operator) {
         }
 
         //Operator pressed before any digit has been input
-        else if (mInput == null) {
+        else if (mInput == null || mInput == 0) {
             mOperator = operator;
         }