diff --git a/app/scripts/models/app-model.js b/app/scripts/models/app-model.js
index 92da98bc..c79b91c1 100644
--- a/app/scripts/models/app-model.js
+++ b/app/scripts/models/app-model.js
@@ -121,6 +121,7 @@ var AppModel = Backbone.Model.extend({
         this.menu.filesSection.removeAllItems();
         this.tags.splice(0, this.tags.length);
         this.filter = {};
+        this.refresh();
     },
 
     closeFile: function(file) {
diff --git a/app/scripts/views/app-view.js b/app/scripts/views/app-view.js
index 27ca5a24..b77c9ac0 100644
--- a/app/scripts/views/app-view.js
+++ b/app/scripts/views/app-view.js
@@ -455,7 +455,11 @@ var AppView = Backbone.View.extend({
         }
         if (this.views.settings) {
             if (this.views.settings.page === page || !menuItem) {
-                this.showEntries();
+                if (this.model.files.hasOpenFiles()) {
+                    this.showEntries();
+                } else {
+                    this.showLastOpenFile();
+                }
             } else {
                 if (menuItem) {
                     this.model.menu.select({item: menuItem});
diff --git a/release-notes.md b/release-notes.md
index 32f17910..4c010a04 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,5 +1,10 @@
 Release notes
 -------------
+##### v1.0.3 (TBD)
+Hotfix
+`-` #92: save files on exit  
+`-` #95: unlock by opening settings  
+
 ##### v1.0.2 (2016-02-17)
 Hotfix  
 `-` #80: dragdrop bug