diff --git a/brew.ino b/brew.ino
index f782565d784f3bd59070c14d1ab49a21f46dcb40..b3913295a477dc8fbcf8d23db1afbc526ccb3722 100644
--- a/brew.ino
+++ b/brew.ino
@@ -1436,7 +1436,11 @@ void runMenuProcessor( MenuData *data ) {
   data->_repaint = repaint;                               // Request repaint
   repaint = displayGenericMenu( &lcd, data );             // Display menu
 
-  if ( checkForEncoderSwitchPush( false ) ) {             // Read selection
+  if ( checkForEncoderSwitchPush( true ) ) {              // Read selection
+    if( cancel ) {
+      resetMenu( true );
+      return;
+    }
     data->_selection = data->_position;
   }