diff --git a/app/ui.js b/app/ui.js
index 85695ca2..dede221a 100644
--- a/app/ui.js
+++ b/app/ui.js
@@ -1063,6 +1063,8 @@ const UI = {
         UI.rfb.showDotCursor = UI.getSetting('show_dot');
 
         UI.updateViewOnly(); // requires UI.rfb
+
+        history.replaceState(null, "", window.location.pathname.substring(1));
     },
 
     disconnect() {
diff --git a/app/webutil.js b/app/webutil.js
index 6a9349a0..6011442c 100644
--- a/app/webutil.js
+++ b/app/webutil.js
@@ -36,7 +36,6 @@ export function getQueryVar(name, defVal) {
     if (typeof defVal === 'undefined') { defVal = null; }
 
     if (match) {
-        history.replaceState(null, "", window.location.pathname.slice(1, 1));
         return decodeURIComponent(match[1]);
     }