diff --git a/css/app.css b/css/app.css
index 5c7d7de80..03aae5503 100644
--- a/css/app.css
+++ b/css/app.css
@@ -2439,7 +2439,6 @@ img.wiki-image {
 }
 
 .mode-save .changeset-list {
-    overflow: auto;
     border:1px solid #ccc;
     border-radius: 4px;
     background:#fff;
@@ -2684,27 +2683,32 @@ img.wiki-image {
 
 /* make tooltips in panels dark */
 .map-overlay .tooltip.top .tooltip-arrow,
-.entity-editor-pane .tooltip.top .tooltip-arrow {
+.entity-editor-pane .tooltip.top .tooltip-arrow,
+.warning-section .tooltip.top .tooltip-arrow {
     border-top-color: #000;
 }
 
 .map-overlay .tooltip.bottom .tooltip-arrow,
-.entity-editor-pane .tooltip.bottom .tooltip-arrow {
+.entity-editor-pane .tooltip.bottom .tooltip-arrow,
+.warning-section .tooltip.bottom .tooltip-arrow {
     border-bottom-color: #000;
 }
 
 .map-overlay .tooltip.left .tooltip-arrow,
-.entity-editor-pane .tooltip.left .tooltip-arrow {
+.entity-editor-pane .tooltip.left .tooltip-arrow,
+.warning-section .tooltip.left .tooltip-arrow {
     border-left-color: #000;
 }
 
 .map-overlay .tooltip.right .tooltip-arrow,
-.entity-editor-pane .tooltip.right .tooltip-arrow {
+.entity-editor-pane .tooltip.right .tooltip-arrow,
+.warning-section .tooltip.right .tooltip-arrow {
     border-right-color: #000;
 }
 
 .map-overlay .tooltip-inner,
-.entity-editor-pane .tooltip-inner {
+.entity-editor-pane .tooltip-inner,
+.warning-section .tooltip-inner {
     background: #000;
     color: #ccc;
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 805785c9d..554f01c8e 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -317,7 +317,7 @@
         "many_deletions": "You're deleting {n} objects. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org.",
         "tag_suggests_area": "The tag {tag} suggests line should be area, but it is not an area",
         "deprecated_tags": "Deprecated tags: {tags}",
-        "untagged_tooltip": "Add tags to describe what type of {geometry} this is."
+        "untagged_tooltip": "Select a feature type that describes what this {geometry} is."
     },
     "zoom": {
         "in": "Zoom In",
diff --git a/js/id/ui/commit.js b/js/id/ui/commit.js
index 809df002e..086b63a70 100644
--- a/js/id/ui/commit.js
+++ b/js/id/ui/commit.js
@@ -78,6 +78,12 @@ iD.ui.Commit = function(context) {
             return d.message;
         });
 
+        warningLi.filter(function(d) { return d.tooltip; })
+            .call(bootstrap.tooltip()
+                .title(function(d) { return d.tooltip; })
+                .placement('top')
+            );
+
         // Save Section
         var saveSection = body.append('div')
             .attr('class','modal-section fillL cf');
@@ -173,10 +179,6 @@ iD.ui.Commit = function(context) {
             .transition()
             .style('opacity', 1);
 
-        li.call(bootstrap.tooltip()
-            .title('wtf')
-            .placement('right'));
-
         function mouseover(d) {
             if (d.entity) {
                 context.surface().selectAll(