diff --git a/swing/src/net/sf/openrocket/startup/SwingStartup.java b/swing/src/net/sf/openrocket/startup/SwingStartup.java
index 82bcce77a..35763cddc 100644
--- a/swing/src/net/sf/openrocket/startup/SwingStartup.java
+++ b/swing/src/net/sf/openrocket/startup/SwingStartup.java
@@ -29,6 +29,7 @@ import net.sf.openrocket.gui.main.Splash;
 import net.sf.openrocket.gui.main.SwingExceptionHandler;
 import net.sf.openrocket.gui.util.GUIUtil;
 import net.sf.openrocket.gui.util.SwingPreferences;
+import net.sf.openrocket.gui.util.UITheme;
 import net.sf.openrocket.logging.LoggingSystemSetup;
 import net.sf.openrocket.logging.PrintStreamToSLF4J;
 import net.sf.openrocket.plugin.PluginModule;
@@ -200,6 +201,12 @@ public class SwingStartup {
 		
 		// Set the look-and-feel
 		log.info("Setting LAF");
+		String cmdLAF = System.getProperty("openrocket.laf");
+		if (cmdLAF != null) {
+			log.info("Setting cmd line LAF '{}'", cmdLAF);
+			Preferences prefs = Application.getPreferences();
+			prefs.setUITheme(UITheme.Themes.valueOf(cmdLAF));
+		}
 		GUIUtil.applyLAF();
 		
 		// Set tooltip delay time.  Tooltips are used in MotorChooserDialog extensively.