Index: trunk/src/org/openstreetmap/josm/actions/HelpAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/HelpAction.java	(revision 2346)
+++ trunk/src/org/openstreetmap/josm/actions/HelpAction.java	(revision 2347)
@@ -35,5 +35,4 @@
                     c = SwingUtilities.getDeepestComponentAt(c, mouse.x, mouse.y);
                     topic = HelpUtil.getContextSpecificHelpTopic(c);
-                    System.out.println("topic is:" + topic);
                 } else {
                     topic = null;
@@ -42,5 +41,4 @@
                 Point mouse = Main.parent.getMousePosition();
                 topic = HelpUtil.getContextSpecificHelpTopic(SwingUtilities.getDeepestComponentAt(Main.parent, mouse.x, mouse.y));
-                System.out.println("topic is:" + topic);
             }
             if (topic == null) {
Index: trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 2346)
+++ trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 2347)
@@ -135,11 +135,30 @@
         JPanel pnl = new JPanel();
         pnl.setLayout(new FlowLayout());
-         
+        
+        // -- download button
         pnl.add(btnDownload = new SideButton(actDownload = new DownloadAction()));
         btnDownload.setFocusable(true);
         btnDownload.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,0), "download");
         btnDownload.getActionMap().put("download",actDownload);
-        pnl.add(new SideButton(new CancelAction()));
-        pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Dialog/DownloadDialog"))));
+
+        // -- cancel button         
+        SideButton btnCancel;
+        CancelAction actCancel = new CancelAction();
+        pnl.add(btnCancel = new SideButton(actCancel));
+        btnCancel.setFocusable(true);
+        btnCancel.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,0), "enter");
+        btnCancel.getActionMap().put("enter",actCancel);
+
+        // -- cancel on ESC 
+        getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE,0), "cancel");
+        getRootPane().getActionMap().put("cancel", actCancel);
+
+        // -- help button 
+        SideButton btnHelp;
+        pnl.add(btnHelp = new SideButton(new ContextSensitiveHelpAction(ht("/Dialog/DownloadDialog"))));
+        btnHelp.setFocusable(true);
+        btnHelp.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,0), "enter");
+        btnHelp.getActionMap().put("enter",btnHelp.getAction());
+        
         return pnl;        
     }
Index: trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java	(revision 2346)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java	(revision 2347)
@@ -3,5 +3,4 @@
 
 import java.awt.Component;
-import java.awt.event.KeyEvent;
 import java.util.Locale;
 
@@ -211,6 +210,5 @@
      * code. Example: /Dialog/RelationEditor is a relative help topic, /De:Help/Dialog/RelationEditor
      * is not.
-     * 
-     * 
+     *  
      * @param component the component  the component
      * @param topic the help topic. Set to the default help topic if null.
@@ -218,7 +216,7 @@
     static public void setHelpContext(JComponent component, String relativeHelpTopic) {
         if (relativeHelpTopic == null) {
-            relativeHelpTopic = "";
-        }
-        component.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_F1,0), "help");
+            relativeHelpTopic = "/";
+        }
+        component.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("F1"), "help");
         component.getActionMap().put("help", Main.main.menu.help);
         component.putClientProperty("help", relativeHelpTopic);