diff --git a/src/training/save_states.rs b/src/training/save_states.rs
index 250a66e..e99da9d 100644
--- a/src/training/save_states.rs
+++ b/src/training/save_states.rs
@@ -354,7 +354,7 @@ pub unsafe fn save_states(module_accessor: &mut app::BattleObjectModuleAccessor)
     ]
     .contains(&fighter_kind);
 
-    if !is_operation_cpu(module_accessor)
+    if MENU.save_state_slot_enable == OnOff::On && !is_operation_cpu(module_accessor)
         && button_config::combo_passes_exclusive(
             module_accessor,
             button_config::ButtonCombo::PrevSaveStateSlot,
@@ -375,7 +375,7 @@ pub unsafe fn save_states(module_accessor: &mut app::BattleObjectModuleAccessor)
         return;
     }
 
-    if !is_operation_cpu(module_accessor)
+    if MENU.save_state_slot_enable == OnOff::On && !is_operation_cpu(module_accessor)
         && button_config::combo_passes_exclusive(
             module_accessor,
             button_config::ButtonCombo::NextSaveStateSlot,
diff --git a/src/training/ui/menu.rs b/src/training/ui/menu.rs
index b91094a..b880ea0 100644
--- a/src/training/ui/menu.rs
+++ b/src/training/ui/menu.rs
@@ -195,10 +195,20 @@ unsafe fn render_toggle_page(app: &App, root_pane: &mut Pane) {
                 let submenu_ids = app.submenu_ids();
 
                 submenu_ids.iter().for_each(|id| {
-                    menu_button
-                        .find_pane_by_name_recursive(id)
-                        .unwrap()
-                        .set_visible(false)
+                    // TODO: Break if ID not found on release
+
+                    let icon = menu_button
+
+                        .find_pane_by_name_recursive(id);
+
+                    if let Some(icon) = icon {
+
+                        icon
+
+                        .set_visible(false);
+
+                }
+
                 });
 
                 title_text.set_text_string(name);