Merge remote-tracking branch 'origin/pr/4276'

2 files changed, 6 insertions, 4 deletions

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index 4b9a8e8cd..55b2f96c4 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -333,13 +333,13 @@ window._qutebrowser.webelem = (function() {
     // it). If nothing is selected but there is something focused, returns
     // "focused"
     funcs.find_selected_focused_link = () => {
-        const elem = window.getSelection().baseNode;
+        const elem = window.getSelection().anchorNode;
         if (elem) {
             return serialize_elem(elem.parentNode);
         }
 
         const serialized_frame_elem = run_frames((frame) => {
-            const node = frame.window.getSelection().baseNode;
+            const node = frame.window.getSelection().anchorNode;
             if (node) {
                 return serialize_elem(node.parentNode, frame);
             }
diff --git a/tests/end2end/data/search_select.js b/tests/end2end/data/search_select.js
index 874e9e9fe..79d27c30c 100644
--- a/tests/end2end/data/search_select.js
+++ b/tests/end2end/data/search_select.js
@@ -7,6 +7,8 @@ if(s.rangeCount > 0) s.removeAllRanges();
 
 for(var i = 0; i < toSelect.length; i++) {
     var range = document.createRange();
-    range.selectNode(toSelect[i]);
-    s.addRange(range);
+    if (toSelect[i].childNodes.length > 0) {
+        range.selectNodeContents(toSelect[i].childNodes[0]);
+        s.addRange(range);
+    }
 }