diff --git a/Firmware/mmu2_error_converter.cpp b/Firmware/mmu2_error_converter.cpp
index 1c760b94b..52fa17fc5 100644
--- a/Firmware/mmu2_error_converter.cpp
+++ b/Firmware/mmu2_error_converter.cpp
@@ -186,20 +186,15 @@ const char * PrusaErrorButtonMore(){
     return MSG_BTN_MORE;
 }
 
-struct ResetOnExit {
-    ResetOnExit() = default;
-    ~ResetOnExit(){
-        buttonSelectedOperation = ButtonOperations::NoOperation;
-    }
-};
-
 Buttons ButtonPressed(ErrorCode ec) {
     if (buttonSelectedOperation == ButtonOperations::NoOperation) {
         return Buttons::NoButton; // no button
     }
-    
-    ResetOnExit ros; // clear buttonSelectedOperation on exit from this call
-    return ButtonAvailable(ec);
+
+    const auto result = ButtonAvailable(ec);
+    buttonSelectedOperation = ButtonOperations::NoOperation; // Reset operation
+
+    return result;
 }
 
 Buttons ButtonAvailable(ErrorCode ec) {