Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 13143)
+++ /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 13144)
@@ -112,4 +112,5 @@
         super(GuiHelper.getFrameForComponent(Main.parent), ModalityType.DOCUMENT_MODAL);
         build();
+        pack();
     }
 
@@ -207,7 +208,5 @@
         addWindowListener(new WindowEventHandler());
 
-
-        // make sure the configuration panels listen to each other
-        // changes
+        // make sure the configuration panels listen to each other changes
         //
         pnlChangesetManagement.addPropertyChangeListener(this);
@@ -604,7 +603,8 @@
      * Listens to window closing events and processes them as cancel events.
      * Listens to window open events and initializes user input
-     *
      */
     class WindowEventHandler extends WindowAdapter {
+        private boolean activatedOnce;
+
         @Override
         public void windowClosing(WindowEvent e) {
@@ -613,7 +613,8 @@
 
         @Override
-        public void windowActivated(WindowEvent arg0) {
-            if (tpConfigPanels.getSelectedIndex() == 0) {
+        public void windowActivated(WindowEvent e) {
+            if (!activatedOnce && tpConfigPanels.getSelectedIndex() == 0) {
                 pnlBasicUploadSettings.initEditingOfUploadComment();
+                activatedOnce = true;
             }
         }