diff --git a/nodes/core/core/58-debug.html b/nodes/core/core/58-debug.html
index 95eb71e3c..c17e487a3 100644
--- a/nodes/core/core/58-debug.html
+++ b/nodes/core/core/58-debug.html
@@ -194,6 +194,16 @@
                 */
             });
 
+            $(window).unload(function() {
+                if (subWindow) {
+                    try {
+                        subWindow.close()
+                    } catch(err) {
+                        console.log(err);
+                    }
+                }
+            });
+
             this.handleWindowMessage = function(evt) {
                 var msg = evt.data;
                 if (msg.event === "mouseEnter") {