diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js
index 581ac5d94..3909c4788 100644
--- a/js/id/ui/inspector.js
+++ b/js/id/ui/inspector.js
@@ -6,24 +6,17 @@ iD.ui.Inspector = function(context) {
     function inspector(selection) {
         var entity = selection.datum();
 
-        var messagewrap = selection.append('div')
-            .attr('class', 'message inspector-inner fillL');
-
-        var message = messagewrap.append('h3');
-
         var inspectorbody = selection.append('div')
             .attr('class', 'fillL');
 
         var presetGrid = iD.ui.PresetGrid(context)
             .entity(entity)
-            .on('message', changeMessage)
             .on('choose', function(preset) {
                 inspectorbody.call(tagEditor, preset);
             });
 
         tagEditor = iD.ui.TagEditor(context)
             .tags(entity.tags)
-            .on('message', changeMessage)
             .on('changeTags', function() {
                 event.changeTags(entity, inspector.tags());
             })
@@ -34,8 +27,6 @@ iD.ui.Inspector = function(context) {
                 inspectorbody.call(presetGrid, true);
             });
 
-        function changeMessage(msg) { message.text(msg);}
-
         if (initial) {
             inspectorbody.call(presetGrid);
         } else {
diff --git a/js/id/ui/presetgrid.js b/js/id/ui/presetgrid.js
index 605b38b9a..bd6171744 100644
--- a/js/id/ui/presetgrid.js
+++ b/js/id/ui/presetgrid.js
@@ -1,5 +1,5 @@
 iD.ui.PresetGrid = function(context) {
-    var event = d3.dispatch('choose', 'message'),
+    var event = d3.dispatch('choose'),
         entity,
         presetData = context.presetData(),
         taginfo = iD.taginfo();
@@ -9,7 +9,12 @@ iD.ui.PresetGrid = function(context) {
         selection.html('');
 
         var viable = presetData.match(entity);
-        event.message(t('inspector.choose'));
+
+        var messagewrap = selection.append('div')
+            .attr('class', 'message inspector-inner fillL');
+
+        var message = messagewrap.append('h3')
+            .text(t('inspector.choose'));
 
         var searchwrap = selection.append('div')
             .attr('class', 'preset-grid-search-wrap inspector-inner');
@@ -28,7 +33,7 @@ iD.ui.PresetGrid = function(context) {
                 } else {
                     var value = search.property('value'),
                         presets = filter(value);
-                    event.message('' + presets.length + ' results for ' + value);
+                    message.text('' + presets.length + ' results for ' + value);
                     grid.call(drawGrid, presets);
                     grid.classed('filtered', value.length);
                 }
diff --git a/js/id/ui/tageditor.js b/js/id/ui/tageditor.js
index beeabca74..09a6f2b8c 100644
--- a/js/id/ui/tageditor.js
+++ b/js/id/ui/tageditor.js
@@ -1,5 +1,5 @@
 iD.ui.TagEditor = function(context) {
-    var event = d3.dispatch('changeTags', 'choose', 'close', 'message'),
+    var event = d3.dispatch('changeTags', 'choose', 'close'),
         presetData = context.presetData(),
         entity,
         tags,
@@ -48,6 +48,12 @@ iD.ui.TagEditor = function(context) {
 
         selection.html('');
 
+        var messagewrap = selection.append('div')
+            .attr('class', 'message inspector-inner fillL');
+
+        var message = messagewrap.append('h3')
+            .text(t('inspector.choose'));
+
         var editorwrap = selection.append('div')
             .attr('class', 'tag-wrap inspector-body');
 
@@ -106,7 +112,7 @@ iD.ui.TagEditor = function(context) {
                 .preset(presetMatch));
         }
 
-        event.message(t('inspector.editing', { type: presetMatch.name }));
+        message.text(t('inspector.editing', { type: presetMatch.name }));
 
         editorwrap.append('div')
             .attr('class','inspector-inner col12 fillL2').call(tagList, presetMatch.name === 'other');