1 files changed, 9 insertions, 1 deletions
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 6b757472..c91764c4 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -207,7 +207,7 @@ class Popup {
 
     hide() {
         this.hideContainer();
-        this.container.blur();
+        this.focusParent();
         this.hideChildren();
     }
 
@@ -248,6 +248,14 @@ class Popup {
         }
     }
 
+    focusParent() {
+        if (this.parent && this.parent.container) {
+            this.parent.container.focus();
+        } else {
+            this.container.blur();
+        }
+    }
+
     async containsPoint(point) {
         if (!this.isVisible()) {
             return false;