diff --git a/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
index 2ecea9d1d2..0222510d95 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
@@ -103,6 +103,9 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
     public static final BooleanProperty PROP_DYNAMIC_BUTTONS = new BooleanProperty("dialog.dynamic.buttons", false);
     private static final String SELECTED = "selected";
 
+    private static final int TITLE_HEIGHT = 
+        (int)(20 * Config.getPref().getDouble("gui.scale", 1.0));
+
     private final transient ParametrizedEnumProperty<ButtonHidingType> propButtonHiding =
             new ParametrizedEnumProperty<>(ButtonHidingType.class, ButtonHidingType.DYNAMIC) {
                 @Override
@@ -442,9 +445,9 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
         if (isDialogInDefaultView()) {
             setContentVisible(false);
             setIsCollapsed(true);
-            setPreferredSize(new Dimension(0, 20));
-            setMaximumSize(new Dimension(Integer.MAX_VALUE, 20));
-            setMinimumSize(new Dimension(Integer.MAX_VALUE, 20));
+            setPreferredSize(new Dimension(0, TITLE_HEIGHT));
+            setMaximumSize(new Dimension(Integer.MAX_VALUE, TITLE_HEIGHT));
+            setMinimumSize(new Dimension(Integer.MAX_VALUE, TITLE_HEIGHT));
             titleBar.lblMinimized.setIcon(ImageProvider.get("misc", "minimized"));
         } else
             throw new IllegalStateException();
@@ -569,8 +572,8 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
                     lblTitle.paint(g);
                 }
             };
-            lblTitleWeak.setPreferredSize(new Dimension(Integer.MAX_VALUE, 20));
-            lblTitleWeak.setMinimumSize(new Dimension(0, 20));
+            lblTitleWeak.setPreferredSize(new Dimension(Integer.MAX_VALUE, TITLE_HEIGHT));
+            lblTitleWeak.setMinimumSize(new Dimension(0, TITLE_HEIGHT));
             add(lblTitleWeak, GBC.std().fill(GridBagConstraints.HORIZONTAL));
 
             buttonsHide = new JButton(ImageProvider.get("misc", buttonHiding != ButtonHidingType.ALWAYS_SHOWN