diff --git a/app/scripts/models/app-model.js b/app/scripts/models/app-model.js
index 3e288ec5..c7288768 100644
--- a/app/scripts/models/app-model.js
+++ b/app/scripts/models/app-model.js
@@ -233,6 +233,9 @@ class AppModel {
     }
 
     closeAllFiles() {
+        if (!this.files.hasOpenFiles()) {
+            return;
+        }
         for (const file of this.files) {
             file.close();
             this.fileClosed(file);
diff --git a/app/scripts/views/app-view.js b/app/scripts/views/app-view.js
index 78689cca..840c4858 100644
--- a/app/scripts/views/app-view.js
+++ b/app/scripts/views/app-view.js
@@ -615,6 +615,9 @@ class AppView extends View {
     }
 
     closeAllFilesAndShowFirst() {
+        if (!this.model.files.hasOpenFiles()) {
+            return;
+        }
         let fileToShow = this.model.files.find(
             (file) => !file.demo && !file.created && !file.skipOpenList
         );