Index: /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 9832)
+++ /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 9833)
@@ -392,4 +392,5 @@
         if (placeContentInScrollPane) {
             JScrollPane pane = new JScrollPane(cp);
+            GuiHelper.setDefaultIncrement(pane);
             pane.setBorder(null);
             setContentPane(pane);
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java	(revision 9832)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java	(revision 9833)
@@ -175,7 +175,5 @@
         InputMapUtils.addSpacebarAction(tblStyles, onoffAction);
 
-        JScrollPane sp = new JScrollPane(p);
-        GuiHelper.setDefaultIncrement(sp);
-        createLayout(sp, false, Arrays.asList(
+        createLayout(p, true, Arrays.asList(
                 new SideButton(onoffAction, false),
                 new SideButton(upAction, false),
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 9832)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 9833)
@@ -46,4 +46,5 @@
 import javax.swing.JScrollPane;
 import javax.swing.JToggleButton;
+import javax.swing.Scrollable;
 import javax.swing.SwingUtilities;
 
@@ -64,4 +65,5 @@
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.Destroyable;
@@ -874,5 +876,9 @@
             Collection<SideButton>... nextButtons) {
         if (scroll) {
-            data = new JScrollPane(data);
+            JScrollPane sp = new JScrollPane(data);
+            if (!(data instanceof Scrollable)) {
+                GuiHelper.setDefaultIncrement(sp);
+            }
+            data = sp;
         }
         LinkedList<Collection<SideButton>> buttons = new LinkedList<>();
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 9832)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 9833)
@@ -293,5 +293,4 @@
         selectSth.setPreferredSize(scrollPane.getSize());
         presets.setSize(scrollPane.getSize());
-        GuiHelper.setDefaultIncrement(scrollPane);
 
         editHelper.loadTagsIfNeeded();