Index: /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java	(revision 3997)
+++ /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java	(revision 3998)
@@ -244,8 +244,4 @@
             if (cs == null) return;
             if (rbExisting.isSelected()) {
-                // create a clone of the selected changeset and make sure
-                // we keep the current changeset comment (see #4371)
-                cs = new Changeset(cs);
-                cs.put("comment", changesetCommentModel.getComment());
                 firePropertyChange(SELECTED_CHANGESET_PROP, null, cs);
             }
@@ -284,5 +280,5 @@
                 cbOpenChangesets.setEnabled(false);
                 firePropertyChange(SELECTED_CHANGESET_PROP, null, null);
-            } else {
+            } else if (rbExisting.isSelected()) {
                 cbOpenChangesets.setEnabled(true);
                 if (cbOpenChangesets.getSelectedItem() == null) {
@@ -291,8 +287,5 @@
                 Changeset cs = (Changeset)cbOpenChangesets.getSelectedItem();
                 if (cs == null) return;
-                // create a clone of the selected changeset and make sure
-                // we keep the current changeset comment (see #4371)
-                cs = new Changeset(cs);
-                cs.put("comment", changesetCommentModel.getComment());
+                changesetCommentModel.setComment(cs.get("comment"));
                 firePropertyChange(SELECTED_CHANGESET_PROP, null, cs);
             }