Index: trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java	(revision 6423)
+++ trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java	(revision 6424)
@@ -99,12 +99,17 @@
     }
 
-    public void setUploadCommentDownFocusTraversalHandler(final Action handler) {
-        hcbUploadComment.getEditor().addActionListener(handler);
-        hcbUploadComment.getEditor().getEditorComponent().addKeyListener(
+    public void setUploadTagDownFocusTraversalHandlers(final Action handler) {
+        setHistoryComboBoxDownFocusTraversalHandler(handler, hcbUploadComment);
+        setHistoryComboBoxDownFocusTraversalHandler(handler, hcbUploadSource);
+    }
+
+    public void setHistoryComboBoxDownFocusTraversalHandler(final Action handler, final HistoryComboBox hcb) {
+        hcb.getEditor().addActionListener(handler);
+        hcb.getEditor().getEditorComponent().addKeyListener(
                 new KeyListener() {
                     @Override
                     public void keyTyped(KeyEvent e) {
                         if (e.getKeyCode() == KeyEvent.VK_TAB) {
-                            handler.actionPerformed(new ActionEvent(hcbUploadComment,0, "focusDown"));
+                            handler.actionPerformed(new ActionEvent(hcb, 0, "focusDown"));
                         }
                     }
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 6423)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 6424)
@@ -227,5 +227,5 @@
         );
 
-        pnlBasicUploadSettings.setUploadCommentDownFocusTraversalHandler(
+        pnlBasicUploadSettings.setUploadTagDownFocusTraversalHandlers(
                 new AbstractAction() {
                     @Override