Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 2280)
+++ /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 2281)
@@ -362,9 +362,9 @@
     protected String getUploadComment() {
         switch(southTabbedPane.getSelectedIndex()) {
-        case 0:
-            return pnlChangesetSelection.getUploadComment();
-        case 1:
-            TagModel tm = tagEditorPanel.getModel().get("comment");
-            return tm == null? "" : tm.getValue();
+            case 0:
+                return pnlChangesetSelection.getUploadComment();
+            case 1:
+                TagModel tm = tagEditorPanel.getModel().get("comment");
+                return tm == null? "" : tm.getValue();
         }
         return "";
@@ -802,5 +802,5 @@
             setUploadComment(comment);
             cmt.getEditor().selectAll();
-            cmt.requestFocus();
+            cmt.requestFocusInWindow();
         }
 
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/AutoCompleteComboBox.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/AutoCompleteComboBox.java	(revision 2280)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/AutoCompleteComboBox.java	(revision 2281)
@@ -19,4 +19,7 @@
 public class AutoCompleteComboBox extends JComboBox {
 
+
+    private boolean autocompleteEnabled = true;
+
     /**
      * Auto-complete a JComboBox.
@@ -24,5 +27,5 @@
      * Inspired by http://www.orbital-computer.de/JComboBox/
      */
-    private class AutoCompleteComboBoxDocument extends PlainDocument {
+    class AutoCompleteComboBoxDocument extends PlainDocument {
         private JComboBox comboBox;
         private boolean selecting = false;
@@ -48,4 +51,6 @@
             // ActionListener informed
             if (selecting)
+                return;
+            if (!autocompleteEnabled)
                 return;
 
@@ -117,3 +122,11 @@
         this.getEditor().setItem(oldValue);
     }
+
+    protected boolean isAutocompleteEnabled() {
+        return autocompleteEnabled;
+    }
+
+    protected void setAutocompleteEnabled(boolean autocompleteEnabled) {
+        this.autocompleteEnabled = autocompleteEnabled;
+    }
 }
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java	(revision 2280)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java	(revision 2281)
@@ -19,5 +19,7 @@
 
     public void setText(String value) {
+        setAutocompleteEnabled(false);
         ((JTextComponent)getEditor().getEditorComponent()).setText(value);
+        setAutocompleteEnabled(true);
     }