diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c
index a103664149..7da95506e9 100644
--- a/menu/drivers/menu_generic.c
+++ b/menu/drivers/menu_generic.c
@@ -229,8 +229,10 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
          BIT64_SET(menu->state, MENU_STATE_RENDER_MESSAGEBOX);
          BIT64_SET(menu->state, MENU_STATE_POST_ITERATE);
          if (action == MENU_ACTION_OK || action == MENU_ACTION_CANCEL)
+         {
             BIT64_SET(menu->state, MENU_STATE_POP_STACK);
-            menu_dialog_set_active(false);
+         }
+         menu_dialog_set_active(false);
          break;
       case ITERATE_TYPE_DEFAULT:
          /* FIXME: Crappy hack, needed for mouse controls