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 b0462437..453cd8bf 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
@@ -147,7 +147,7 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
 
         secondValue = getSecondValue()
         calculateResult()
-        if (lastOperation == DIVIDE && secondValue == 0.0) {
+        if ( (lastOperation == DIVIDE || lastOperation == PERCENT) && secondValue == 0.0) {
             lastKey = DIGIT
             return
         }