diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 49d825319..083d4b6b0 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -692,4 +692,6 @@ class MainWindow(QWidget):
 
         sessions.session_manager.save_last_window_session()
         self._save_geometry()
+
         log.destroy.debug("Closing window {}".format(self.win_id))
+        self.tabbed_browser.shutdown()
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index d061bfc43..987fad3ac 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -382,11 +382,11 @@ class TabbedBrowser(QWidget):
     def shutdown(self):
         """Try to shut down all tabs cleanly."""
         self.shutting_down = True
-        # Reverse tabs so we don't have to recacluate tab titles over and over
+        # Reverse tabs so we don't have to recalculate tab titles over and over
         # Removing first causes [2..-1] to be recomputed
         # Removing the last causes nothing to be recomputed
         for tab in reversed(self.widgets()):
-            self._remove_tab(tab)
+            self._remove_tab(tab, add_undo=False)
 
     def tab_close_prompt_if_pinned(
             self, tab, force, yes_action,