diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index 77971c240..31afed57a 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -378,6 +378,8 @@ PreferencesDialog.lbl.languageEffect = The language will change the next time yo
 generalprefs.lbl.language = Interface language
 generalprefs.languages.default = System default
 generalprefs.lbl.languageEffect = The language will change the next time you start OpenRocket.
+generalprefs.ImportWarning.title = Reload OpenRocket
+generalprefs.ImportWarning.msg = You may need to restart OpenRocket for some of the changes to take effect.
 
 PreferencesExporter.chooser.title = Export the Preferences File
 
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preferences/GeneralPreferencesPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/preferences/GeneralPreferencesPanel.java
index 09e1ef7d1..484c0b9b4 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/preferences/GeneralPreferencesPanel.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/preferences/GeneralPreferencesPanel.java
@@ -264,13 +264,19 @@ public class GeneralPreferencesPanel extends PreferencesPanel {
 		importPreferences.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				PreferencesImporter.importPreferences(parent);
-				SwingUtilities.invokeLater(new Runnable() {
-					@Override
-					public void run() {
-						PreferencesDialog.showPreferences(parent.getParentFrame());		// Refresh the preferences dialog
-					}
-				});
+				boolean imported = PreferencesImporter.importPreferences(parent);
+				if (imported) {
+					SwingUtilities.invokeLater(new Runnable() {
+						@Override
+						public void run() {
+							JOptionPane.showMessageDialog(parent,
+									trans.get("generalprefs.ImportWarning.msg"),
+									trans.get("generalprefs.ImportWarning.title"),
+									JOptionPane.WARNING_MESSAGE);
+							PreferencesDialog.showPreferences(parent.getParentFrame());        // Refresh the preferences dialog
+						}
+					});
+				}
 			}
 		});
 		buttonPanel.add(importPreferences);