Index: /trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java	(revision 15116)
+++ /trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java	(revision 15117)
@@ -19,5 +19,4 @@
 import java.util.concurrent.TimeUnit;
 
-import javax.swing.Action;
 import javax.swing.BorderFactory;
 import javax.swing.JCheckBox;
@@ -162,10 +161,10 @@
     }
 
-    public void setUploadTagDownFocusTraversalHandlers(final Action handler) {
+    void setUploadTagDownFocusTraversalHandlers(final ActionListener handler) {
         setHistoryComboBoxDownFocusTraversalHandler(handler, hcbUploadComment);
         setHistoryComboBoxDownFocusTraversalHandler(handler, hcbUploadSource);
     }
 
-    public void setHistoryComboBoxDownFocusTraversalHandler(final Action handler, final HistoryComboBox hcb) {
+    private static void setHistoryComboBoxDownFocusTraversalHandler(ActionListener handler, HistoryComboBox hcb) {
         hcb.getEditor().addActionListener(handler);
         hcb.getEditorComponent().addKeyListener(new HistoryComboBoxKeyAdapter(hcb, handler));
@@ -177,7 +176,9 @@
     public void rememberUserInput() {
         // store the history of comments
-        hcbUploadComment.addCurrentItemToHistory();
-        Config.getPref().putList(HISTORY_KEY, hcbUploadComment.getHistory());
-        Config.getPref().putLong(HISTORY_LAST_USED_KEY, TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()));
+        if (getHistoryMaxAgeKey() > 0) {
+            hcbUploadComment.addCurrentItemToHistory();
+            Config.getPref().putList(HISTORY_KEY, hcbUploadComment.getHistory());
+            Config.getPref().putLong(HISTORY_LAST_USED_KEY, TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()));
+        }
         // store the history of sources
         hcbUploadSource.addCurrentItemToHistory();
@@ -232,9 +233,17 @@
     }
 
+    static long getHistoryMaxAgeKey() {
+        return Config.getPref().getLong(HISTORY_MAX_AGE_KEY, TimeUnit.HOURS.toSeconds(4));
+    }
+
+    static long getHistoryLastUsedKey() {
+        return Config.getPref().getLong(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0);
+    }
+
     static final class HistoryComboBoxKeyAdapter extends KeyAdapter {
         private final HistoryComboBox hcb;
-        private final Action handler;
-
-        HistoryComboBoxKeyAdapter(HistoryComboBox hcb, Action handler) {
+        private final ActionListener handler;
+
+        HistoryComboBoxKeyAdapter(HistoryComboBox hcb, ActionListener handler) {
             this.hcb = hcb;
             this.handler = handler;
Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 15116)
+++ /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 15117)
@@ -27,5 +27,4 @@
 import java.util.Map.Entry;
 import java.util.Optional;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -238,12 +237,5 @@
         );
 
-        pnlBasicUploadSettings.setUploadTagDownFocusTraversalHandlers(
-                new AbstractAction() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        btnUpload.requestFocusInWindow();
-                    }
-                }
-        );
+        pnlBasicUploadSettings.setUploadTagDownFocusTraversalHandlers(e -> btnUpload.requestFocusInWindow());
 
         setMinimumSize(new Dimension(600, 350));
@@ -778,7 +770,6 @@
     private static String getLastChangesetTagFromHistory(String historyKey, List<String> def) {
         Collection<String> history = Config.getPref().getList(historyKey, def);
-        long age = System.currentTimeMillis() / 1000 - Config.getPref().getLong(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0);
-        if (age < Config.getPref().getLong(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, TimeUnit.HOURS.toSeconds(4))
-                && !history.isEmpty()) {
+        long age = System.currentTimeMillis() / 1000 - BasicUploadSettingsPanel.getHistoryLastUsedKey();
+        if (age < BasicUploadSettingsPanel.getHistoryMaxAgeKey() && !history.isEmpty()) {
             return history.iterator().next();
         }