diff --git a/aqt/deckbrowser.py b/aqt/deckbrowser.py
index 6d61ef1d1..5a1463d12 100644
--- a/aqt/deckbrowser.py
+++ b/aqt/deckbrowser.py
@@ -176,7 +176,7 @@ where id > ?""", (self.mw.col.sched.dayCutoff-86400)*1000)
         buf += """
 
         <td class=decktd colspan=5>%s%s<a class="deck %s"
-        href=# onclick="pycmd('open:%d')">%s</a></td>"""% (
+        href=# onclick="return pycmd('open:%d')">%s</a></td>"""% (
             indent(), collapse, extraclass, did, name)
         # due counts
         def nonzeroColour(cnt, colour):
diff --git a/aqt/webview.py b/aqt/webview.py
index cc0fce5a0..ca4e18191 100644
--- a/aqt/webview.py
+++ b/aqt/webview.py
@@ -49,7 +49,8 @@ class AnkiWebPage(QWebEnginePage):
                         }
                     }
                 
-                    channel.objects.py.cmd(arg, resultCB);                   
+                    channel.objects.py.cmd(arg, resultCB);
+                    return false;                   
                 }
                 pycmd("domDone");
             });
@@ -71,9 +72,10 @@ class AnkiWebPage(QWebEnginePage):
         # data: links generated by setHtml()
         if url.scheme() == "data":
             return True
+        # catch buggy <a href='#' onclick='func()'> links
         from aqt import mw
-        # ignore href=#
-        if url.toString().startswith(mw.serverURL()):
+        if url.matches(QUrl(mw.serverURL()), QUrl.RemoveFragment):
+            sys.stderr.write("onclick handler needs to return false\n")
             return False
         # load all other links in browser
         openLink(url)