Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java	(revision 17227)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java	(revision 17228)
@@ -55,5 +55,5 @@
         super(GuiHelper.getFrameForComponent(parent), tr("Preferences"), ModalityType.DOCUMENT_MODAL);
         build();
-        this.setMinimumSize(new Dimension(600, 350));
+        this.setMinimumSize(new Dimension(800, 600));
         // set the maximum width to the current screen. If the dialog is opened on a
         // smaller screen than before, this will reset the stored preference.
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 17227)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 17228)
@@ -493,5 +493,5 @@
         for (PreferenceTab tab : tabs) {
             if (tab.getTabPreferenceSetting().equals(tps)) {
-                insertGUITabsForSetting(icon, tps, getTabCount());
+                insertGUITabsForSetting(icon, tps, tab.getComponent(), getTabCount());
             }
         }
@@ -502,8 +502,14 @@
         for (PreferenceTab tab : tabs) {
             if (tab.getTabPreferenceSetting().equals(tps)) {
-                insertTab(tps.getTitle(), icon, tab.getComponent(), tps.getTooltip(), position++);
+                insertGUITabsForSetting(icon, tps, tab.getComponent(), position);
+                position++;
             }
         }
         return position - 1;
+    }
+
+    private void insertGUITabsForSetting(Icon icon, TabPreferenceSetting tps, final Component component, int position) {
+        String title = "<html><div style='width:150px'>" + tps.getTitle();
+        insertTab(title, icon, component, tps.getTooltip(), position);
     }
 
@@ -525,5 +531,5 @@
                     } else {
                         // If it has not been initialized, create an empty tab with only icon and tooltip
-                        addTab(tps.getTitle(), icon, new PreferencePanel(tps), tps.getTooltip());
+                        insertGUITabsForSetting(icon, tps, new PreferencePanel(tps), getTabCount());
                     }
                 }
