diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
index 4f689507d..66c2b6f95 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
@@ -141,8 +141,10 @@ public class PreferencesDialog extends JDialog {
 				// We don't want to lose the preference for the confirmation dialog
 				boolean isShowDiscardConfirmation = preferences.isShowDiscardPreferencesConfirmation();
 
-				// Reload initial preferences
-				if (!storePreferences) {
+				// Either store changed preferences (if OK) or reload initial preferences (if Cancel)
+				if (storePreferences) {
+					preferences.storeDefaultUnits();
+				} else {
 					loadInitPreferences();
 				}