diff --git a/src/aare/gui/main_window.py b/src/aare/gui/main_window.py
index daa6d885..80b37c96 100644
--- a/src/aare/gui/main_window.py
+++ b/src/aare/gui/main_window.py
@@ -2895,11 +2895,6 @@ class MainWindow(QMainWindow):
         )
 
     def closeEvent(self, event) -> None:
-        try:
-            self._return_to_main_view_for_shutdown()
-        except Exception as e:
-            logger.warning(f"Failed to restore main view before close: {e}", exc_info=True)
-
         try:
             # Closing while watch-only would persist the all-hidden fold and
             # poison every future start — put the pre-watch layout back first.
@@ -2931,11 +2926,6 @@ class MainWindow(QMainWindow):
         if self._cleanup_done:
             return
 
-        try:
-            self._return_to_main_view_for_shutdown()
-        except Exception as e:
-            logger.warning(f"Failed to restore main view during cleanup: {e}", exc_info=True)
-
         self._cleanup_done = True
 
         try: