diff --git a/core/src/net/sf/openrocket/rocketcomponent/Transition.java b/core/src/net/sf/openrocket/rocketcomponent/Transition.java
index 710cf55ec..18cffea6d 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/Transition.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/Transition.java
@@ -262,6 +262,10 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
 		this.type = type;
 		this.clipped = type.isClippable();
 		this.shapeParameter = type.defaultParameter();
+
+		// Need to clearPreset when shape type changes.
+		clearPreset();
+
 		fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
 	}
 
@@ -279,6 +283,10 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
 		if (shapeParameter == n)
 			return;
 		this.shapeParameter = MathUtil.clamp(n, type.minParameter(), type.maxParameter());
+
+		// Need to clearPreset when shape type changes.
+		clearPreset();
+
 		fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
 	}