Merge branch 'master' into firefox-amo

1 files changed, 5 insertions, 1 deletions

diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 05c7ff27..64143ffe 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -89,7 +89,8 @@ function optionsSetDefaults(options) {
             showAdvanced: false,
             popupWidth: 400,
             popupHeight: 250,
-            popupOffset: 10
+            popupOffset: 10,
+            showGuide: true
         },
 
         scanning: {
@@ -144,6 +145,9 @@ function optionsVersion(options) {
             } else {
                 options.general.audioSource = 'disabled';
             }
+        },
+        () => {
+            options.general.showGuide = false;
         }
     ];