Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 8204)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 8205)
@@ -7,4 +7,5 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.Container;
 import java.awt.Cursor;
 import java.awt.Dimension;
@@ -77,4 +78,5 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
@@ -632,4 +634,17 @@
             rememberLastTags.setState(PROPERTY_REMEMBER_TAGS.get());
             popupMenu.add(rememberLastTags);
+        }
+
+        @Override
+        public void setContentPane(Container contentPane) {
+            final String text = "<html>" + Utils.join("<br>", Arrays.asList(
+                    tr("<code>Ctrl-1</code> to apply first suggestion"),
+                    tr("<code>Shift-Enter</code> to add without closing the dialog"),
+                    tr("<code>Shift-Ctrl-1</code> to add first suggestion without closing the dialog")
+            ));
+            final JLabel helpLabel = new JLabel(text);
+            helpLabel.setFont(helpLabel.getFont().deriveFont(Font.PLAIN));
+            contentPane.add(helpLabel, GBC.eol().insets(1, 2, 1, 2));
+            super.setContentPane(contentPane);
         }
 
@@ -710,6 +725,10 @@
                 final String color = action.isEnabled() ? "" : "; color:gray";
                 final JLabel tagLabel = new JLabel("<html>"
-                    + "<style>td{border:1px solid gray; font-weight:normal"+color+"}</style>"
-                    + "<table><tr><td>" + XmlWriter.encode(t.toString(), true) + "</td></tr></table></html>");
+                        + "<style>td{" + color + "}</style>"
+                        + "<table><tr>"
+                        + "<td>" + count + ".</td>"
+                        + "<td style='border:1px solid gray'>" + XmlWriter.encode(t.toString(), true) + "<" +
+                        "/td></tr></table></html>");
+                tagLabel.setFont(tagLabel.getFont().deriveFont(Font.PLAIN));
                 if (action.isEnabled()) {
                     // Register action
