diff --git a/nodes/core/core/58-debug.html b/nodes/core/core/58-debug.html
index d53623162..c421c0604 100644
--- a/nodes/core/core/58-debug.html
+++ b/nodes/core/core/58-debug.html
@@ -170,7 +170,7 @@
             this.handleDebugMessage = function(t,o) {
                 var sourceNode = RED.nodes.node(o.id) || RED.nodes.node(o.z);
                 if (sourceNode) {
-                    o._source = {id:sourceNode.id,z:sourceNode.z};
+                    o._source = {id:sourceNode.id,z:sourceNode.z,name:sourceNode.name};
 
                 }
                 RED.debug.handleDebugMessage(o);
diff --git a/nodes/core/core/lib/debug/debug-utils.js b/nodes/core/core/lib/debug/debug-utils.js
index ad18dab2c..9c9f48661 100644
--- a/nodes/core/core/lib/debug/debug-utils.js
+++ b/nodes/core/core/lib/debug/debug-utils.js
@@ -205,7 +205,7 @@ RED.debug = (function() {
         var metaRow = $('<div class="debug-message-meta"></div>').appendTo(msg);
         $('<span class="debug-message-date">'+ getTimestamp()+'</span>').appendTo(metaRow);
         if (sourceNode) {
-            $('<a>',{href:"#",class:"debug-message-name"}).html('node: '+sourceNode.id)
+            $('<a>',{href:"#",class:"debug-message-name"}).html('node: '+(sourceNode.name||sourceNode.id))
             .appendTo(metaRow)
             .click(function(evt) {
                 evt.preventDefault();