diff --git a/src/common/menu.rs b/src/common/menu.rs
index 99d1560..29fa23e 100644
--- a/src/common/menu.rs
+++ b/src/common/menu.rs
@@ -201,17 +201,6 @@ pub fn handle_final_input_mapping(
                         EVENT_QUEUE.push(Event::menu_open(menu_json));
                     }
                 });
-                (button_mapping(ButtonConfig::PLUS, style, button_presses)
-                    || button_mapping(ButtonConfig::MINUS, style, button_presses))
-                .then(|| {
-                    received_input = true;
-                    // Leave menu.
-                    frame_counter::start_counting(*MENU_CLOSE_FRAME_COUNTER);
-                    QUICK_MENU_ACTIVE = false;
-                    let menu_json = app.get_menu_selections();
-                    set_menu_from_json(&menu_json);
-                    EVENT_QUEUE.push(Event::menu_open(menu_json));
-                });
                 button_mapping(ButtonConfig::X, style, button_presses).then(|| {
                     app.save_defaults();
                     received_input = true;
diff --git a/src/training/mash.rs b/src/training/mash.rs
index d1d63b0..d54e8b0 100644
--- a/src/training/mash.rs
+++ b/src/training/mash.rs
@@ -264,15 +264,6 @@ unsafe fn get_buffered_action(
         } else {
             None
         }
-    } else if is_in_shieldstun(module_accessor) {
-        let action = MENU.shieldstun_override.get_random();
-        if action != Action::empty() {
-            Some(action)
-        } else if MENU.mash_triggers.contains(MashTrigger::SHIELDSTUN) {
-            Some(MENU.mash_state.get_random())
-        } else {
-            None
-        }
     } else if is_in_footstool(module_accessor) {
         let action = MENU.footstool_override.get_random();
         if action != Action::empty() {
@@ -312,6 +303,7 @@ unsafe fn get_buffered_action(
     {
         Some(MENU.mash_state.get_random())
     } else {
+        // SHIELD handled in shield.rs
         // LEDGE handled in ledge.rs
         None
     }
diff --git a/src/training/shield.rs b/src/training/shield.rs
index 5aec36a..43e9955 100644
--- a/src/training/shield.rs
+++ b/src/training/shield.rs
@@ -241,6 +241,18 @@ unsafe fn mod_handle_sub_guard_cont(fighter: &mut L2CFighterCommon) {
         return;
     }
 
+    if is_in_parry(module_accessor) {
+        return;
+    }
+
+    if MENU.mash_triggers.contains(MashTrigger::SHIELDSTUN) {
+        if MENU.shieldstun_override == Action::empty() {
+            mash::external_buffer_menu_mash(MENU.mash_state.get_random())
+        } else {
+            mash::external_buffer_menu_mash(MENU.shieldstun_override.get_random())
+        }
+    }
+
     let action = mash::get_current_buffer();
 
     if handle_escape_option(fighter, module_accessor) {