Index: trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 7371)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 7375)
@@ -233,4 +233,6 @@
                 }
         );
+
+        setMinimumSize(new Dimension(300, 350));
 
         Main.pref.addPreferenceChangeListener(this);
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java	(revision 7371)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java	(revision 7375)
@@ -105,5 +105,5 @@
         gc.gridx = 1;
         gc.gridy = 1;
-        gc.weightx = 0.0;
+        gc.weightx = 1.0;
         gc.weighty = 0.0;
         gc.gridwidth = 2;
@@ -113,5 +113,5 @@
         gc.gridx = 3;
         gc.gridy = 1;
-        gc.weightx = 1.0;
+        gc.weightx = 0.0;
         gc.weighty = 0.0;
         gc.gridwidth = 1;
@@ -126,5 +126,5 @@
         gc.gridx = 1;
         gc.gridy = 2;
-        gc.weightx = 0.0;
+        gc.weightx = 1.0;
         gc.weighty = 0.0;
         gc.gridwidth = 1;
@@ -140,5 +140,5 @@
         gc.gridx = 3;
         gc.gridy = 2;
-        gc.weightx = 1.0;
+        gc.weightx = 0.0;
         gc.weighty = 0.0;
         gc.gridwidth = 1;
@@ -153,5 +153,5 @@
         gc.gridx = 1;
         gc.gridy = 3;
-        gc.weightx = 0.0;
+        gc.weightx = 1.0;
         gc.weighty = 0.0;
         gc.gridwidth = 2;
@@ -161,5 +161,5 @@
         gc.gridx = 3;
         gc.gridy = 3;
-        gc.weightx = 1.0;
+        gc.weightx = 0.0;
         gc.weighty = 0.0;
         gc.gridwidth = 1;
Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java	(revision 7371)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java	(revision 7375)
@@ -30,4 +30,8 @@
         super(doc, text, columns);
         TextContextualPopupMenu.enableMenuFor(this);
+        // Fix minimum size when columns are specified
+        if (columns > 0) {
+            setMinimumSize(getPreferredSize());
+        }
     }