diff --git a/core/src/net/sf/openrocket/gui/components/compass/CompassSelectionButton.java b/core/src/net/sf/openrocket/gui/components/compass/CompassSelectionButton.java
index c8b0fee2e..6267ce3e3 100644
--- a/core/src/net/sf/openrocket/gui/components/compass/CompassSelectionButton.java
+++ b/core/src/net/sf/openrocket/gui/components/compass/CompassSelectionButton.java
@@ -16,6 +16,7 @@ import javax.swing.event.ChangeListener;
 
 import net.miginfocom.swing.MigLayout;
 import net.sf.openrocket.gui.Resettable;
+import net.sf.openrocket.gui.SpinnerEditor;
 import net.sf.openrocket.gui.adaptors.DoubleModel;
 import net.sf.openrocket.gui.components.FlatButton;
 import net.sf.openrocket.l10n.Translator;
@@ -137,6 +138,7 @@ public class CompassSelectionButton extends FlatButton implements Resettable {
 			panel.add(new JPanel(), "growy, wrap");
 			
 			JSpinner spin = new JSpinner(model.getSpinnerModel());
+			spin.setEditor( new SpinnerEditor( spin ) );
 			panel.add(spin, "wmin 50lp, growx, gapright 0, aligny bottom");
 			
 			panel.add(new JLabel("" + Chars.DEGREE), "wrap para");
diff --git a/core/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java b/core/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java
index 08dfa19eb..3b848735b 100644
--- a/core/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java
+++ b/core/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java
@@ -17,6 +17,7 @@ import javax.swing.JTextField;
 
 import net.miginfocom.swing.MigLayout;
 import net.sf.openrocket.database.Databases;
+import net.sf.openrocket.gui.SpinnerEditor;
 import net.sf.openrocket.gui.adaptors.DoubleModel;
 import net.sf.openrocket.gui.components.StyledLabel;
 import net.sf.openrocket.gui.components.UnitSelector;
@@ -173,14 +174,15 @@ public class CustomMaterialDialog extends JDialog {
 				density = new DoubleModel(originalMaterial.getDensity(),
 						originalMaterial.getType().getUnitGroup(), 0);
 				densitySpinner.setModel(density.getSpinnerModel());
+				densitySpinner.setEditor(new SpinnerEditor(densitySpinner));
 				densityUnit.setModel(density);
 			}
 		} else {
 			Material.Type type = (Material.Type) typeBox.getSelectedItem();
 			density = new DoubleModel(0, type.getUnitGroup(), 0);
 			densitySpinner.setModel(density.getSpinnerModel());
+			densitySpinner.setEditor(new SpinnerEditor(densitySpinner));
 			densityUnit.setModel(density);
 		}
-		((DefaultEditor) densitySpinner.getEditor()).getTextField().setEditable(true);
 	}
 }