diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
index 42e6fa67..cff7c9de 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
@@ -123,6 +123,11 @@ class MainActivity : SimpleActivity(), Calculator {
         }
     }
 
+    override fun onSaveInstanceState(bundle: Bundle) {
+        super.onSaveInstanceState(bundle)
+        bundle.putString(CALCULATOR_STATE, calc.getCalculatorStateJson().toString())
+    }
+
     private fun setupOptionsMenu() {
         main_toolbar.setOnMenuItemClickListener { menuItem ->
             when (menuItem.itemId) {
@@ -244,9 +249,4 @@ class MainActivity : SimpleActivity(), Calculator {
             calc.handleOperation(operation)
         }
     }
-
-    override fun onSaveInstanceState(bundle: Bundle) {
-        super.onSaveInstanceState(bundle)
-        bundle.putString(CALCULATOR_STATE, calc.getCalculatorStateJson().toString())
-    }
 }