Index: /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/DownloadAction2.java
===================================================================
--- /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/DownloadAction2.java	(revision 27690)
+++ /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/DownloadAction2.java	(revision 27691)
@@ -28,7 +28,7 @@
 public class DownloadAction2 extends JosmAction {
     public DownloadAction2() {
-        super(tr("Download from OSM..."), "download", tr("Download map data from the OSM server."),
-                Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download from OSM...")), KeyEvent.VK_D, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY), true);
-        putValue("help", ht("/Action/Download"));
+        super(tr("Download from OSM mirror..."), "download", tr("Download map data from the OSM server."),
+                Shortcut.registerShortcut("mirror:download", tr("File: {0}", tr("Download from OSM mirror...")), KeyEvent.VK_D, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY), true);
+        putValue("help", ht("/Action/MirroredDownload"));
     }
 
Index: /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionAction.java
===================================================================
--- /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionAction.java	(revision 27690)
+++ /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionAction.java	(revision 27691)
@@ -30,5 +30,5 @@
 
     public void actionPerformed(ActionEvent e) {
-        UrlSelectionDialog dialog = new UrlSelectionDialog(this);
+        UrlSelectionDialog dialog = UrlSelectionDialog.getInstance();
         dialog.setVisible(true);
     }
Index: /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionDialog.java
===================================================================
--- /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionDialog.java	(revision 27690)
+++ /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionDialog.java	(revision 27691)
@@ -69,8 +69,8 @@
   private JComboBox cbSelectUrl = null;
 
-  public UrlSelectionDialog(UrlSelectionAction controller) {
+  public UrlSelectionDialog() {
 
     Frame frame = JOptionPane.getFrameForComponent(Main.parent);
-    jDialog = new JDialog(frame, tr("Create Stops from GPX"), false);
+    jDialog = new JDialog(frame, tr("Select OSM mirror URL"), false);
     tabbedPane = new JTabbedPane();
     JPanel tabSettings = new JPanel();
@@ -129,3 +129,13 @@
     jDialog.setVisible(visible);
   }
+
+  private static UrlSelectionDialog singleton = null;
+
+  public static UrlSelectionDialog getInstance() {
+
+    if (singleton == null)
+      singleton = new UrlSelectionDialog();
+
+    return singleton;
+  }
 }