diff --git a/nodes/core/core/58-debug.html b/nodes/core/core/58-debug.html
index 45d00f909..c784bbdf2 100644
--- a/nodes/core/core/58-debug.html
+++ b/nodes/core/core/58-debug.html
@@ -184,9 +184,10 @@
             RED.comms.subscribe("debug",this.handleDebugMessage);
 
             RED.events.on("workspace:change", this.refreshMessageList);
+
             $("#debug-tab-open").click(function(e) {
                 e.preventDefault();
-                subWindow = window.open(document.location.toString().replace(/#.*$/,"")+"debug/view/view.html","nodeREDDebugView","menubar=no,location=no,toolbar=no,chrome,height=500,width=600");
+                subWindow = window.open(document.location.toString().replace(/[?#].*$/,"")+"debug/view/view.html"+document.location.search,"nodeREDDebugView","menubar=no,location=no,toolbar=no,chrome,height=500,width=600");
                 subWindow.onload = function() {
                     subWindow.postMessage({event:"workspaceChange",activeWorkspace:RED.workspaces.active()},"*");
                 }