diff --git a/BlocksScreen/lib/panels/filamentTab.py b/BlocksScreen/lib/panels/filamentTab.py
index ae9453fa..015e7915 100644
--- a/BlocksScreen/lib/panels/filamentTab.py
+++ b/BlocksScreen/lib/panels/filamentTab.py
@@ -872,6 +872,8 @@ def on_mmu_state_changed(self, mmu_state):
             if mmu_state.action == "Idle":
                 self.load_state = False
                 self.call_load_panel.emit(False, "", True)
+                if not len(mmu_state.gates) > 1:
+                    self._basic_panel.change_page(0)
                 return
             self.call_load_panel.emit(True, mmu_state.action, True)
 
diff --git a/BlocksScreen/lib/panels/widgets/basicFilamentPanel.py b/BlocksScreen/lib/panels/widgets/basicFilamentPanel.py
index 60c68da0..00769f13 100644
--- a/BlocksScreen/lib/panels/widgets/basicFilamentPanel.py
+++ b/BlocksScreen/lib/panels/widgets/basicFilamentPanel.py
@@ -156,6 +156,7 @@ def on_load_filament(self, status: dict):
             if not status["state"]:
                 self.target_temp = 0
                 self.call_load_panel.emit(False, "", False)
+                self.change_page(0)
                 if self.state == "paused":
                     self.request_change_tab.emit(0)
                 return
@@ -170,6 +171,7 @@ def on_unload_filament(self, status: dict):
             if not status["state"]:
                 self.target_temp = 0
                 self.call_load_panel.emit(False, "", False)
+                self.change_page(0)
                 return
         self.call_load_panel.emit(
             True, f"Unloading Filament\n{status['step'].capitalize()}", False