diff --git a/src/csui/LoggerUi.vue b/src/csui/LoggerUi.vue
index c1a40ae..cb4a754 100644
--- a/src/csui/LoggerUi.vue
+++ b/src/csui/LoggerUi.vue
@@ -8,7 +8,8 @@
         <div class="button flex-noshrink button-header"
             @click="hidePopup()"
         >
-          Close
+          <template v-if="logStringified">Finish logging</template>
+          <template v-else>Hide popup</template>
         </div>
         <!-- <div class="button flex-noshrink button-header"
              @click="stopLogging()"
@@ -77,7 +78,7 @@
             <div class="button button-bar button-primary"
                  @click="exportAndQuit()"
             >
-              Export & quit
+              Export & finish
             </div>
           </div>
         </template>
diff --git a/src/ext/lib/Logger.js b/src/ext/lib/Logger.js
index f266e49..61a09a1 100644
--- a/src/ext/lib/Logger.js
+++ b/src/ext/lib/Logger.js
@@ -96,7 +96,6 @@ class Logger {
     this.temp_disable = false;
     this.stopTime = this.conf.timeout ? performance.now() + (this.conf.timeout * 1000) : undefined;
 
-    const ths = this;
     const br = currentBrowser.firefox ? browser : chrome;
 
     br.storage.onChanged.addListener( (changes, area) => {
@@ -107,7 +106,11 @@ class Logger {
         }
       }
       if (changes['uwLogger'] && changes['uwLogger'].newValue) {
-        ths.conf = JSON.parse(changes.uwLogger.newValue);
+        const newConf = JSON.parse(changes.uwLogger.newValue);
+        if (this.isContentScript && this.conf.allowLogging && !newConf.allowLogging) {
+          this.saveToVuex();
+        }
+        this.conf = newConf;
       }
     });
   }