Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java	(revision 13744)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java	(revision 13745)
@@ -52,5 +52,5 @@
         add(new JLabel(tr("{0} Make sure OSM has the permission to use this service", "1.")), GBC.eol());
         add(new JLabel(tr("{0} Enter GetCapabilities URL", "2.")), GBC.eol());
-        add(rawUrl, GBC.eol().fill());
+        add(rawUrl, GBC.eol().fill(GBC.HORIZONTAL));
         rawUrl.setLineWrap(true);
         JButton getLayers = new JButton(tr("{0} Get layers", "3."));
@@ -59,7 +59,7 @@
         add(new JLabel(tr("{0} Select layers", "4.")), GBC.eol());
 
-        add(endpoint, GBC.eol().fill());
+        add(endpoint, GBC.eol());
         setDefaultLayers.setEnabled(false);
-        add(setDefaultLayers, GBC.eol().fill());
+        add(setDefaultLayers, GBC.eol());
         add(new JScrollPane(tree.getLayerTree()), GBC.eol().fill().weight(1, 100));
 
@@ -75,9 +75,9 @@
         add(wmsInstruction, GBC.eol());
         wmsInstruction.setLabelFor(wmsUrl);
-        add(wmsUrl, GBC.eop().fill());
+        add(wmsUrl, GBC.eop().fill(GBC.HORIZONTAL));
         wmsUrl.setLineWrap(true);
 
         add(new JLabel(tr("{0} Enter name for this layer", "7.")), GBC.eol());
-        add(name, GBC.eop().fill());
+        add(name, GBC.eop().fill(GBC.HORIZONTAL));
 
         getLayers.addActionListener(e -> {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java	(revision 13744)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMTSLayerPanel.java	(revision 13745)
@@ -46,5 +46,5 @@
         add(new JLabel(tr("{0} Make sure OSM has the permission to use this service", "1.")), GBC.eol());
         add(new JLabel(tr("{0} Enter GetCapabilities URL", "2.")), GBC.eol());
-        add(rawUrl, GBC.eop().fill());
+        add(rawUrl, GBC.eop().fill(GBC.HORIZONTAL));
         rawUrl.setLineWrap(true);
         rawUrl.setAlignmentY(TOP_ALIGNMENT);
@@ -54,8 +54,7 @@
                 getLayers.setEnabled(setDefaultLayer.isSelected());
         });
-        add(setDefaultLayer, GBC.eop().fill());
-        add(getLayers, GBC.eop().fill());
-        add(new JLabel(tr("Choose default layer")), GBC.eol().fill());
-        layerPanel.setPreferredSize(new Dimension(250, 100));
+        add(setDefaultLayer, GBC.eop());
+        add(getLayers, GBC.eop().fill(GBC.HORIZONTAL));
+        add(new JLabel(tr("Choose default layer")), GBC.eol());
         add(layerPanel, GBC.eol().fill());