diff --git a/src/extensions/default/JavaScriptCodeHints/thirdparty/acorn b/src/extensions/default/JavaScriptCodeHints/thirdparty/acorn
index 4435013900b..78e1d7ada68 160000
--- a/src/extensions/default/JavaScriptCodeHints/thirdparty/acorn
+++ b/src/extensions/default/JavaScriptCodeHints/thirdparty/acorn
@@ -1 +1 @@
-Subproject commit 4435013900b329797224a4e94acc0934e28acc4a
+Subproject commit 78e1d7ada684868d92d09555408ae2df1812b5ae
diff --git a/src/extensions/default/JavaScriptCodeHints/thirdparty/tern b/src/extensions/default/JavaScriptCodeHints/thirdparty/tern
index ed952deb43d..7606a6448a8 160000
--- a/src/extensions/default/JavaScriptCodeHints/thirdparty/tern
+++ b/src/extensions/default/JavaScriptCodeHints/thirdparty/tern
@@ -1 +1 @@
-Subproject commit ed952deb43d3fc095038763cf777ee61d8e7665a
+Subproject commit 7606a6448a8f7a2aacd50d10d9752440689803e8
diff --git a/src/extensions/default/QuickView/main.js b/src/extensions/default/QuickView/main.js
index 01c252c7513..912399bfe11 100644
--- a/src/extensions/default/QuickView/main.js
+++ b/src/extensions/default/QuickView/main.js
@@ -739,11 +739,13 @@ define(function (require, exports, module) {
         CommandManager.get(CMD_ENABLE_QUICK_VIEW).setChecked(enabled);
     }
 
-    function setExtensionlessImagePreview(_extensionlessImagePreview) {
+    function setExtensionlessImagePreview(_extensionlessImagePreview, doNotSave) {
         if(extensionlessImagePreview !== _extensionlessImagePreview) {
             extensionlessImagePreview = _extensionlessImagePreview;
-            prefs.set("extensionlessImagePreview", enabled);
-            prefs.save();
+            if (!doNotSave) {
+                prefs.set("extensionlessImagePreview", enabled);
+                prefs.save();
+            }
         }
     }
 
@@ -814,7 +816,7 @@ define(function (require, exports, module) {
 
     // Setup initial UI state
     setEnabled(prefs.get("enabled"), true);
-    setExtensionlessImagePreview(prefs.get("extensionlessImagePreview"));
+    setExtensionlessImagePreview(prefs.get("extensionlessImagePreview"), true);
     
     prefs.on("change", "enabled", function () {
         setEnabled(prefs.get("enabled"), true);