diff --git a/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java
index 03882cce5..564ba3954 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java
@@ -184,8 +184,7 @@ public class MotorConfig extends JPanel {
 			public void actionPerformed(ActionEvent e) {
 				String id = configuration.getFlightConfigurationID();
 				
-				MotorChooserDialog dialog = new MotorChooserDialog(mount.getMotor(id),
-						mount.getMotorDelay(id), mount.getMotorMountDiameter(),
+				MotorChooserDialog dialog = new MotorChooserDialog(mount, id,
 						SwingUtilities.getWindowAncestor(MotorConfig.this));
 				dialog.setVisible(true);
 				Motor m = dialog.getSelectedMotor();
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java
index 811169dd0..1cb7178f6 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java
@@ -207,11 +207,7 @@ public class MotorConfigurationPanel extends JPanel {
 		
 		MotorConfiguration config = mount.getMotorConfiguration().get(id);
 		
-		MotorChooserDialog dialog = new MotorChooserDialog(
-				config.getMotor(),
-				config.getEjectionDelay(),
-				mount.getMotorMountDiameter(),
-				flightConfigurationDialog);
+		MotorChooserDialog dialog = new MotorChooserDialog(mount, id, flightConfigurationDialog);
 		dialog.setVisible(true);
 		Motor m = dialog.getSelectedMotor();
 		double d = dialog.getSelectedDelay();
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java
index 761d4dab6..898964af0 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java
@@ -16,7 +16,7 @@ import net.sf.openrocket.gui.dialogs.motor.thrustcurve.ThrustCurveMotorSelection
 import net.sf.openrocket.gui.util.GUIUtil;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.motor.Motor;
-import net.sf.openrocket.motor.ThrustCurveMotor;
+import net.sf.openrocket.rocketcomponent.MotorMount;
 import net.sf.openrocket.startup.Application;
 
 public class MotorChooserDialog extends JDialog implements CloseableDialog {
@@ -27,13 +27,13 @@ public class MotorChooserDialog extends JDialog implements CloseableDialog {
 	private static final Translator trans = Application.getTranslator();
 	
 	
-	public MotorChooserDialog(Motor current, double delay, double diameter, Window owner) {
+	public MotorChooserDialog(MotorMount mount, String currentConfig, Window owner) {
 		super(owner, trans.get("MotorChooserDialog.title"), Dialog.ModalityType.APPLICATION_MODAL);
 		
 		
 		JPanel panel = new JPanel(new MigLayout("fill"));
 		
-		selectionPanel = new ThrustCurveMotorSelectionPanel((ThrustCurveMotor) current, delay, diameter);
+		selectionPanel = new ThrustCurveMotorSelectionPanel(mount, currentConfig);
 		
 		panel.add(selectionPanel, "grow, wrap para");
 		
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
index 3456fa65b..731a5f5ba 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
@@ -15,7 +15,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 import java.util.prefs.Preferences;
 
 import javax.swing.BorderFactory;
@@ -57,6 +56,8 @@ import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.logging.Markers;
 import net.sf.openrocket.motor.Motor;
 import net.sf.openrocket.motor.ThrustCurveMotor;
+import net.sf.openrocket.rocketcomponent.MotorConfiguration;
+import net.sf.openrocket.rocketcomponent.MotorMount;
 import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.util.BugException;
@@ -157,20 +158,25 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
 	 * @param delay		the currently selected ejection charge delay.
 	 * @param diameter	the diameter of the motor mount.
 	 */
-	public ThrustCurveMotorSelectionPanel(ThrustCurveMotor current, double delay, double diameter) {
+	public ThrustCurveMotorSelectionPanel(MotorMount mount, String currentConfig) {
 		super(new MigLayout("fill", "[grow][]"));
 		
-		
+		double diameter = 0;
+		if (currentConfig != null && mount != null) {
+			MotorConfiguration motorConf = mount.getMotorConfiguration().get(currentConfig);
+			selectedMotor = (ThrustCurveMotor) motorConf.getMotor();
+			selectedDelay = motorConf.getEjectionDelay();
+			diameter = mount.getMotorMountDiameter();
+		}
 		
 		// Construct the database (adding the current motor if not in the db already)
 		List<ThrustCurveMotorSet> db;
 		db = Application.getThrustCurveMotorSetDatabase().getMotorSets();
 		
 		// If current motor is not found in db, add a new ThrustCurveMotorSet containing it
-		if (current != null) {
-			selectedMotor = current;
+		if (selectedMotor != null) {
 			for (ThrustCurveMotorSet motorSet : db) {
-				if (motorSet.getMotors().contains(current)) {
+				if (motorSet.getMotors().contains(selectedMotor)) {
 					selectedMotorSet = motorSet;
 					break;
 				}
@@ -178,7 +184,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
 			if (selectedMotorSet == null) {
 				db = new ArrayList<ThrustCurveMotorSet>(db);
 				ThrustCurveMotorSet extra = new ThrustCurveMotorSet();
-				extra.addMotor(current);
+				extra.addMotor(selectedMotor);
 				selectedMotorSet = extra;
 				db.add(extra);
 				Collections.sort(db);
@@ -345,7 +351,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
 			private void update() {
 				String text = searchField.getText().trim();
 				String[] split = text.split("\\s+");
-				rowFilter.setSearchTerms( Arrays.asList(split) );
+				rowFilter.setSearchTerms(Arrays.asList(split));
 				sorter.sort();
 				scrollSelectionVisible();
 			}
@@ -555,7 +561,6 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
 		
 		// Update the panel data
 		updateData();
-		selectedDelay = delay;
 		setDelays(false);
 		
 	}