Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 2230)
+++ /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 2231)
@@ -46,4 +46,5 @@
 import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
+import javax.swing.text.JTextComponent;
 
 import org.openstreetmap.josm.Main;
@@ -203,5 +204,5 @@
         getContentPane().add(buildActionPanel(), BorderLayout.SOUTH);
 
-        addWindowListener(new WindowClosingAdapter());
+        addWindowListener(new WindowEventHandler());
     }
 
@@ -398,5 +399,4 @@
                     )
             ).apply(this);
-            startUserInput();
         } else if (!visible && isShowing()){
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
@@ -566,8 +566,13 @@
      *
      */
-    class WindowClosingAdapter extends WindowAdapter {
+    class WindowEventHandler extends WindowAdapter {
         @Override
         public void windowClosing(WindowEvent e) {
             setCanceled(true);
+        }
+
+        @Override
+        public void windowActivated(WindowEvent e) {
+            startUserInput();
         }
     }
@@ -748,6 +753,10 @@
          */
         public void startUserInput() {
-            cmt.getEditor().selectAll();
-            cmt.requestFocus();
+            List<String> history = cmt.getHistory();
+            if (history != null && !history.isEmpty()) {
+                cmt.setText(history.get(0));
+            }
+            cmt.requestFocusInWindow();
+            cmt.getEditor().getEditorComponent().requestFocusInWindow();
         }
 
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/AutoCompleteComboBox.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/AutoCompleteComboBox.java	(revision 2230)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/AutoCompleteComboBox.java	(revision 2231)
@@ -2,4 +2,6 @@
 package org.openstreetmap.josm.gui.widgets;
 
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
 import java.util.Collection;
 
@@ -93,6 +95,15 @@
 
     public AutoCompleteComboBox() {
-        JTextComponent editor = (JTextComponent) this.getEditor().getEditorComponent();
+        final JTextComponent editor = (JTextComponent) this.getEditor().getEditorComponent();
         editor.setDocument(new AutoCompleteComboBoxDocument(this));
+        editor.addFocusListener(
+                new FocusListener() {
+                    public void focusLost(FocusEvent e) {
+                    }
+                    public void focusGained(FocusEvent e) {
+                        editor.selectAll();
+                    }
+                }
+        );
     }