Index: trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 7543)
+++ trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 7545)
@@ -11,4 +11,5 @@
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -209,5 +210,5 @@
      *
      * @param content Any element that can be displayed in the message dialog
-     * @param placeContentInScrollPane if  true, places  the content in a JScrollPane
+     * @param placeContentInScrollPane if true, places the content in a JScrollPane
      * @return {@code this}
      */
@@ -447,5 +448,6 @@
     private void setupEscListener() {
         Action actionListener = new AbstractAction() {
-            @Override public void actionPerformed(ActionEvent actionEvent) {
+            @Override
+            public void actionPerformed(ActionEvent actionEvent) {
                 // 0 means that the dialog has been closed otherwise.
                 // We need to set it to zero again, in case the dialog has been re-used
@@ -608,6 +610,6 @@
     /**
      * Convenience function that converts a given string into a JMultilineLabel
-     * @param msg
-     * @return JMultilineLabel
+     * @param msg the message to display
+     * @return JMultilineLabel displaying {@code msg}
      */
     private static JMultilineLabel string2label(String msg) {
@@ -616,4 +618,6 @@
         Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
         lbl.setMaxWidth(screenSize.width/2);
+        // Disable default Enter key binding to allow dialog's one (then enables to hit default button from here)
+        lbl.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), new Object());
         return lbl;
     }