diff --git a/Gruntfile.js b/Gruntfile.js
index 45ec30f..b6c04dd 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -44,6 +44,7 @@ module.exports = function(grunt) {
       "js/**",
       "css/*.css",//leave the LESS behind
       "**/*.html",//both main.html and the templates
+      "templates/*",
       "require.js",
       "background.js",
       "installer.js",
diff --git a/config/user.json b/config/user.json
index 1e7d6aa..f76f600 100644
--- a/config/user.json
+++ b/config/user.json
@@ -77,10 +77,12 @@
   "autosaveOnBlur": false,
   //If the editor jumps to the top on focus change, set this:
   "disableReload": false,
+  //Set this to stop the editor from restoring the last set of tabs it had open
+  "disableTabRestore": false,
 
   //Wildly eccentric? You might like Vim keybindings.
   "emulateVim": false,
 
   //Whether to show the "New file" tab button on the tab bar;
   "showNewTabButton": false
-}
\ No newline at end of file
+}
diff --git a/js/sessions/autosave.js b/js/sessions/autosave.js
index a190282..43c2d11 100644
--- a/js/sessions/autosave.js
+++ b/js/sessions/autosave.js
@@ -20,7 +20,7 @@ define([
   var autosave = function() {
     status.toast(i18n.get("fileAutosaving"));
     state.tabs.forEach(function(tab) {
-      if (tab.file && !tab.file.virtual) {
+      if (tab.file && !tab.file.virtual && tab.modified) {
         tab.save();
       }
     });
diff --git a/manifest.json b/manifest.json
index ffbfaa4..0ff1128 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Caret",
   "description": "Professional text editing for Chrome and Chrome OS",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "manifest_version": 2,
   "default_locale": "en",
   "icons": {