diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
index 8e2d8347..dd88488b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
@@ -118,8 +118,14 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
             }
         }
 
-        lastKey = operation
-        lastOperation = operation
+        if (getSecondValue() == 0.0 && inputDisplayedFormula.contains("÷")) {
+            lastKey = DIVIDE
+            lastOperation = DIVIDE
+        } else {
+            lastKey = operation
+            lastOperation = operation
+        }
+
         showNewResult(inputDisplayedFormula)
     }