diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 9efc93dbc7..03fb3e4f34 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -248,7 +248,6 @@ namespace Terminal {
                 if (focus_timeout == 0) {
                     focus_timeout = Timeout.add (20, () => {
                         focus_timeout = 0;
-                        save_opened_terminals (true, true);
                         return Source.REMOVE;
                     });
                 }
@@ -1357,7 +1356,7 @@ namespace Terminal {
             string[] opened_tabs = {};
             int focused_tab = 0;
 
-            if (save_zooms) {
+            if (save_zooms && current_terminal != null) {
                 Application.saved_state.set_double ("zoom", current_terminal.font_scale);
             }