diff --git a/ext/fg/js/driver.js b/ext/fg/js/driver.js
index f1a0be9f..280a7dca 100644
--- a/ext/fg/js/driver.js
+++ b/ext/fg/js/driver.js
@@ -100,9 +100,11 @@ class Driver {
     }
 
     onMouseDown(e) {
+        this.lastMousePos = {x: e.clientX, y: e.clientY};
+        this.popupTimerClear();
+
         if (this.popup.visible()) {
-            const selection = window.getSelection();
-            selection.removeAllRanges();
+            this.hidePopup();
         }
     }
 
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 83da3fe1..2a2f7c54 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -66,6 +66,8 @@ class Popup {
             return;
         }
 
+        this.container.contentWindow.scrollTo(0, 0);
+
         const doc = this.container.contentDocument;
         doc.open();
         doc.write(content);