Index: src/org/openstreetmap/josm/gui/preferences/LafPreference.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/LafPreference.java	(revision 1010)
+++ src/org/openstreetmap/josm/gui/preferences/LafPreference.java	(working copy)
@@ -4,14 +4,20 @@
 import static org.openstreetmap.josm.tools.I18n.tr;

 import java.awt.Component;
+import java.awt.GridBagLayout;
 import java.lang.reflect.*;

 import javax.swing.DefaultListCellRenderer;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.ListCellRenderer;
 import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
+import javax.swing.BorderFactory;
+import javax.swing.Box;

 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.GBC;
@@ -42,9 +61,15 @@
 		});
 		lafCombo.addActionListener(gui.requireRestartAction);

-		gui.display.add(new JLabel(tr("Look and Feel")), GBC.std());
-		gui.display.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
-		gui.display.add(lafCombo, GBC.eol().fill(GBC.HORIZONTAL));
+		JPanel panel = new JPanel(new GridBagLayout());
+		panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+		panel.add(new JLabel(tr("Look and Feel")), GBC.std());
+		panel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
+		panel.add(lafCombo, GBC.eol().fill(GBC.HORIZONTAL));
+		panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
+		JScrollPane scrollpane = new JScrollPane(panel);
+		scrollpane.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 ));
+		gui.displaycontent.addTab(tr("Look and Feel"), scrollpane);
 	}

 	public void ok() {