diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index d7bc02cc..d6c5eac6 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -95,7 +95,7 @@ class Frontend extends TextScanner {
 
     onRuntimeMessage({action, params}, sender, callback) {
         const {targetPopupId} = params || {};
-        if (targetPopupId !== 'all' && targetPopupId !== this.popup.id) { return; }
+        if (typeof targetPopupId !== 'undefined' && targetPopupId !== this.popup.id) { return; }
 
         const handler = this._runtimeMessageHandlers.get(action);
         if (typeof handler !== 'function') { return false; }
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 9a7a91f3..6898a6eb 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -851,7 +851,7 @@ class Display {
     }
 
     setPopupVisibleOverride(visible) {
-        return apiForward('popupSetVisibleOverride', {visible, targetPopupId: 'all'});
+        return apiForward('popupSetVisibleOverride', {visible});
     }
 
     setSpinnerVisible(visible) {