diff --git a/core/src/net/sf/openrocket/motor/MotorConfiguration.java b/core/src/net/sf/openrocket/motor/MotorConfiguration.java
index fd8cedb71..e2b3f4b24 100644
--- a/core/src/net/sf/openrocket/motor/MotorConfiguration.java
+++ b/core/src/net/sf/openrocket/motor/MotorConfiguration.java
@@ -226,6 +226,16 @@ public class MotorConfiguration implements FlightConfigurableParameter<MotorConf
         return clone;
     }
 
+	public void copyFrom(MotorConfiguration configuration) {
+		if (configuration == null) return;
+
+		this.motor = configuration.motor;
+		this.ejectionDelay = configuration.ejectionDelay;
+		this.ignitionOveride = configuration.ignitionOveride;
+		this.ignitionDelay = configuration.ignitionDelay;
+		this.ignitionEvent = configuration.ignitionEvent;
+	}
+
 
 
     public int getModID() {
diff --git a/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java b/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
index 01bb7ca66..28e87dc51 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
@@ -390,7 +390,7 @@ public class BodyTube extends SymmetricComponent implements BoxBounded, MotorMou
 	}
 
 	@Override 
-	public void setMotorConfig( final MotorConfiguration newMotorConfig, final FlightConfigurationId fcid){
+	public void setMotorConfig(MotorConfiguration newMotorConfig, FlightConfigurationId fcid){
 		if(null == newMotorConfig){
 			this.motors.set( fcid, null);
 		}else{
@@ -405,7 +405,11 @@ public class BodyTube extends SymmetricComponent implements BoxBounded, MotorMou
 
 		for (RocketComponent listener : configListeners) {
 			if (listener instanceof BodyTube) {
-				((BodyTube) listener).setMotorConfig(newMotorConfig, fcid);
+				if (newMotorConfig != null) {
+					BodyTube tube = (BodyTube) listener;
+					MotorConfiguration config = tube.getMotorConfig(fcid);
+					config.copyFrom(newMotorConfig);
+				}
 			}
 		}
 	}
diff --git a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
index 29f2f8538..73e8d7d2d 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
@@ -1872,6 +1872,10 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
 	public void clearConfigListeners() {
 		configListeners.clear();
 	}
+
+	public List<RocketComponent> getConfigListeners() {
+		return configListeners;
+	}
 	
 	
 	/**
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java
index d4cb67e97..13f596b03 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java
@@ -85,7 +85,15 @@ public abstract class FinSetConfig extends RocketComponentConfig {
 							document.addUndoPosition(trans.get("FinSetConfig.Convertfinset"));
 							RocketComponent freeform =
 									FreeformFinSet.convertFinSet((FinSet) component);
-							ComponentConfigDialog.showDialog(freeform);
+
+							List<RocketComponent> listeners = new ArrayList<>();
+							for (RocketComponent listener : component.getConfigListeners()) {
+								if (listener instanceof FinSet) {
+									listeners.add(FreeformFinSet.convertFinSet((FinSet) listener));
+								}
+							}
+
+							ComponentConfigDialog.showDialog(freeform, listeners);
 						}
 					});