diff --git a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
index 8e52d97f6..320c4b43a 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
@@ -49,6 +49,7 @@ import net.sf.openrocket.gui.adaptors.Column;
 import net.sf.openrocket.gui.adaptors.ColumnTable;
 import net.sf.openrocket.gui.adaptors.ColumnTableModel;
 import net.sf.openrocket.gui.adaptors.DoubleModel;
+import net.sf.openrocket.gui.components.EditableSpinner;
 import net.sf.openrocket.gui.components.BasicSlider;
 import net.sf.openrocket.gui.components.ConfigurationComboBox;
 import net.sf.openrocket.gui.components.StageSelector;
@@ -113,7 +114,7 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 
 		JTable table;
 
-		JPanel panel = new JPanel(new MigLayout("fill", "[120lp][70lp][]"));
+		JPanel panel = new JPanel(new MigLayout("fill", "[120lp][70lp][50lp][]"));
 		add(panel);
 
 		rkt = rocketPanel.getDocument().getRocket();
@@ -134,7 +135,9 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 
 		//// Wind direction:
 		panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.winddir")));
-		panel.add(new UnitSelector(theta, true), "width 50lp!");
+		EditableSpinner spinner = new EditableSpinner(theta.getSpinnerModel());
+		panel.add(spinner, "growx");
+		panel.add(new UnitSelector(theta));
 		BasicSlider slider = new BasicSlider(theta.getSliderModel(0, 2 * Math.PI));
 		panel.add(slider, "growx, split 2");
 		//// Worst button
@@ -165,17 +168,20 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 
 		////Angle of attack:
 		panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.angleofattack")));
-		panel.add(new UnitSelector(aoa, true), "width 50lp!");
+		panel.add(new EditableSpinner(aoa.getSpinnerModel()), "growx");
+		panel.add(new UnitSelector(aoa));
 		panel.add(new BasicSlider(aoa.getSliderModel(0, Math.PI)), "growx, wrap");
 
 		//// Mach number:
 		panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.machnumber")));
-		panel.add(new UnitSelector(mach, true), "width 50lp!");
+		panel.add(new EditableSpinner(mach.getSpinnerModel()));
+		panel.add(new UnitSelector(mach));
 		panel.add(new BasicSlider(mach.getSliderModel(0, 3)), "growx, wrap");
 
 		//// Roll rate:
 		panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.rollrate")));
-		panel.add(new UnitSelector(roll, true), "width 50lp!");
+		panel.add(new EditableSpinner(roll.getSpinnerModel()), "growx");
+		panel.add(new UnitSelector(roll));
 		panel.add(new BasicSlider(roll.getSliderModel(-20 * 2 * Math.PI, 20 * 2 * Math.PI)),
 				"growx, wrap");