Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 9210)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 9211)
@@ -330,9 +330,5 @@
         getContentPane().add(pnlButtons, BorderLayout.SOUTH);
         validate();
-        int numTagDecisions = getTagConflictResolverModel().getNumDecisions();
-        int numRelationDecisions = getRelationMemberConflictResolverModel().getNumDecisions();
-        if (numTagDecisions > 0 && numRelationDecisions > 0) {
-            spTagConflictTypes.setDividerLocation(0.5);
-        }
+        adjustDividerLocation();
         pnlRelationMemberConflictResolver.prepareForEditing();
     }
@@ -354,4 +350,5 @@
         if (visible) {
             prepareGUIBeforeConflictResolutionStarts();
+            setMinimumSize(new Dimension(400, 400));
             new WindowGeometry(getClass().getName() + ".geometry", WindowGeometry.centerInWindow(Main.parent,
                     new Dimension(800, 600))).applySafe(this);
@@ -411,12 +408,18 @@
     }
 
+    private void adjustDividerLocation() {
+        int numTagDecisions = getTagConflictResolverModel().getNumDecisions();
+        int numRelationDecisions = getRelationMemberConflictResolverModel().getNumDecisions();
+        if (numTagDecisions > 0 && numRelationDecisions > 0) {
+            double nTop = 1.0 + numTagDecisions;
+            double nBottom = 2.5 + numRelationDecisions;
+            spTagConflictTypes.setDividerLocation(nTop/(nTop+nBottom));
+        }
+    }
+
     class AdjustDividerLocationAction extends WindowAdapter {
         @Override
         public void windowOpened(WindowEvent e) {
-            int numTagDecisions = getTagConflictResolverModel().getNumDecisions();
-            int numRelationDecisions = getRelationMemberConflictResolverModel().getNumDecisions();
-            if (numTagDecisions > 0 && numRelationDecisions > 0) {
-                spTagConflictTypes.setDividerLocation(0.5);
-            }
+            adjustDividerLocation();
         }
     }