diff --git a/editor/js/ui/projects.js b/editor/js/ui/projects.js
index 0b819877a..04571fa55 100644
--- a/editor/js/ui/projects.js
+++ b/editor/js/ui/projects.js
@@ -910,7 +910,9 @@ RED.projects = (function() {
                                                 }
                                             }
                                         }
-                                    },projectData).always(function() {
+                                    },projectData).then(function() {
+                                        RED.events.emit("project:change", {name:name});
+                                    }).always(function() {
                                         RED.deploy.setDeployInflight(false);
                                     })
 
@@ -1075,7 +1077,9 @@ RED.projects = (function() {
                     }
                 },
             }
-        },{active:true}).always(function() {
+        },{active:true}).then(function() {
+            RED.events.emit("project:change", {name:name});
+        }).always(function() {
             RED.deploy.setDeployInflight(false);
         })
     }
diff --git a/nodes/core/core/58-debug.html b/nodes/core/core/58-debug.html
index ba987dcb1..051602ace 100644
--- a/nodes/core/core/58-debug.html
+++ b/nodes/core/core/58-debug.html
@@ -183,6 +183,18 @@
             };
             RED.comms.subscribe("debug",this.handleDebugMessage);
 
+            this.clearMessageList = function() {
+                RED.debug.clearMessageList(true);
+                if (subWindow) {
+                    try {
+                        subWindow.postMessage({event:"projectChange"},"*");
+                    } catch(err) {
+                        console.log(err);
+                    }
+                }
+            };
+            RED.events.on("project:change", this.clearMessageList);
+
             $("#debug-tab-open").click(function(e) {
                 e.preventDefault();
                 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");
diff --git a/nodes/core/core/lib/debug/debug-utils.js b/nodes/core/core/lib/debug/debug-utils.js
index 6512f6b44..cbb623ef9 100644
--- a/nodes/core/core/lib/debug/debug-utils.js
+++ b/nodes/core/core/lib/debug/debug-utils.js
@@ -68,7 +68,7 @@ RED.debug = (function() {
         // var filterTypeRow = $('<div class="debug-filter-row"></div>').appendTo(filterDialog);
         // $('<select><option>Show all debug nodes</option><option>Show selected debug nodes</option><option>Show current flow only</option></select>').appendTo(filterTypeRow);
 
-        var debugNodeListRow = $('<div class="debug-filter-row hide"></div>').appendTo(filterDialog);
+        var debugNodeListRow = $('<div class="debug-filter-row hide" id="debug-filter-node-list-row"></div>').appendTo(filterDialog);
         var flowCheckboxes = {};
         var debugNodeListHeader = $('<div><span data-i18n="node-red:debug.sidebar.debugNodes"></span><span></span></div>');
         var headerCheckbox = $('<input type="checkbox">').appendTo(debugNodeListHeader.find("span")[1]).checkboxSet();
@@ -218,9 +218,7 @@ RED.debug = (function() {
 
         toolbar.find("#debug-tab-clear").click(function(e) {
             e.preventDefault();
-            $(".debug-message").remove();
-            messageCount = 0;
-            config.clear();
+            clearMessageList(false);
         });
 
 
@@ -508,10 +506,28 @@ RED.debug = (function() {
         }
     }
 
+    function clearMessageList(clearFilter) {
+        $(".debug-message").remove();
+        config.clear();
+        if (!!clearFilter) {
+            clearFilterSettings();
+        }
+        refreshDebugNodeList();
+    }
+
+    function clearFilterSettings() {
+        filteredNodes = {};
+        filterType = 'filterAll';
+        $('.debug-tab-filter-option').removeClass('selected');
+        $('#debug-tab-filterAll').addClass('selected');
+        $('#debug-tab-filter span').text(RED._('node-red:debug.sidebar.filterAll'));
+        $('#debug-filter-node-list-row').slideUp();
+    }
+
     return {
         init: init,
         refreshMessageList:refreshMessageList,
         handleDebugMessage: handleDebugMessage,
-
+        clearMessageList: clearMessageList,
     }
 })();
diff --git a/nodes/core/core/lib/debug/debug.js b/nodes/core/core/lib/debug/debug.js
index d8e63e12b..51adeac76 100644
--- a/nodes/core/core/lib/debug/debug.js
+++ b/nodes/core/core/lib/debug/debug.js
@@ -24,6 +24,8 @@ $(function() {
                 RED.debug.handleDebugMessage(evt.data.msg);
             } else if (evt.data.event === "workspaceChange") {
                 RED.debug.refreshMessageList(evt.data.activeWorkspace);
+            } else if (evt.data.event === "projectChange") {
+                RED.debug.clearMessageList(true);
             }
         },false);
     })