diff --git a/swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar b/swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar
index 8a565c890..f0d035cc8 100644
Binary files a/swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar and b/swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar differ
diff --git a/swing/lib/jogl/gluegen-rt-natives-linux-i586.jar b/swing/lib/jogl/gluegen-rt-natives-linux-i586.jar
index 73fef9804..d9f789ec3 100644
Binary files a/swing/lib/jogl/gluegen-rt-natives-linux-i586.jar and b/swing/lib/jogl/gluegen-rt-natives-linux-i586.jar differ
diff --git a/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar b/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar
index a8ea24f06..130731720 100644
Binary files a/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar and b/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar differ
diff --git a/swing/lib/jogl/gluegen-rt-natives-windows-amd64.jar b/swing/lib/jogl/gluegen-rt-natives-windows-amd64.jar
index 8be2607e4..6c5b925b2 100644
Binary files a/swing/lib/jogl/gluegen-rt-natives-windows-amd64.jar and b/swing/lib/jogl/gluegen-rt-natives-windows-amd64.jar differ
diff --git a/swing/lib/jogl/gluegen-rt-natives-windows-i586.jar b/swing/lib/jogl/gluegen-rt-natives-windows-i586.jar
index d9f263429..814c3b99d 100644
Binary files a/swing/lib/jogl/gluegen-rt-natives-windows-i586.jar and b/swing/lib/jogl/gluegen-rt-natives-windows-i586.jar differ
diff --git a/swing/lib/jogl/gluegen-rt.jar b/swing/lib/jogl/gluegen-rt.jar
index ee7287ae6..c20455ec7 100644
Binary files a/swing/lib/jogl/gluegen-rt.jar and b/swing/lib/jogl/gluegen-rt.jar differ
diff --git a/swing/lib/jogl/jogl-all-natives-linux-amd64.jar b/swing/lib/jogl/jogl-all-natives-linux-amd64.jar
index 823cb352e..9bbc12c09 100644
Binary files a/swing/lib/jogl/jogl-all-natives-linux-amd64.jar and b/swing/lib/jogl/jogl-all-natives-linux-amd64.jar differ
diff --git a/swing/lib/jogl/jogl-all-natives-linux-i586.jar b/swing/lib/jogl/jogl-all-natives-linux-i586.jar
index 73da07f48..f3e92cd63 100644
Binary files a/swing/lib/jogl/jogl-all-natives-linux-i586.jar and b/swing/lib/jogl/jogl-all-natives-linux-i586.jar differ
diff --git a/swing/lib/jogl/jogl-all-natives-macosx-universal.jar b/swing/lib/jogl/jogl-all-natives-macosx-universal.jar
index 0ff432d97..35f72f55a 100644
Binary files a/swing/lib/jogl/jogl-all-natives-macosx-universal.jar and b/swing/lib/jogl/jogl-all-natives-macosx-universal.jar differ
diff --git a/swing/lib/jogl/jogl-all-natives-windows-amd64.jar b/swing/lib/jogl/jogl-all-natives-windows-amd64.jar
index ebfab4f05..314434879 100644
Binary files a/swing/lib/jogl/jogl-all-natives-windows-amd64.jar and b/swing/lib/jogl/jogl-all-natives-windows-amd64.jar differ
diff --git a/swing/lib/jogl/jogl-all-natives-windows-i586.jar b/swing/lib/jogl/jogl-all-natives-windows-i586.jar
index dafaae992..f49d9ce19 100644
Binary files a/swing/lib/jogl/jogl-all-natives-windows-i586.jar and b/swing/lib/jogl/jogl-all-natives-windows-i586.jar differ
diff --git a/swing/lib/jogl/jogl-all.jar b/swing/lib/jogl/jogl-all.jar
index d86116ca0..1d048da6b 100644
Binary files a/swing/lib/jogl/jogl-all.jar and b/swing/lib/jogl/jogl-all.jar differ
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 ff9de619f..7ea640b54 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
@@ -310,6 +310,10 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
 	}
 
 	public void setMotorMountAndConfig( MotorMount mount, String currentConfig ) {
+		selectedMotor = null;
+		selectedMotorSet = null;
+		selectedDelay = 0;
+		
 		ThrustCurveMotor motorToSelect = null;
 		if (currentConfig != null && mount != null) {
 			MotorConfiguration motorConf = mount.getMotorConfiguration().get(currentConfig);
@@ -317,21 +321,14 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
 			selectedDelay = motorConf.getEjectionDelay();
 		}
 
-		selectedMotorSet = null;
-		
 		// If current motor is not found in db, add a new ThrustCurveMotorSet containing it
 		if (motorToSelect != null) {
-			for (ThrustCurveMotorSet motorSet : database) {
-				if (motorSet.getMotors().contains(motorToSelect)) {
-					selectedMotorSet = motorSet;
-					break;
-				}
-			}
-			if (selectedMotorSet == null) {
+			ThrustCurveMotorSet motorSetToSelect = null;
+			motorSetToSelect = findMotorSet(motorToSelect);
+			if (motorSetToSelect == null) {
 				database = new ArrayList<ThrustCurveMotorSet>(database);
 				ThrustCurveMotorSet extra = new ThrustCurveMotorSet();
 				extra.addMotor(motorToSelect);
-				selectedMotorSet = extra;
 				database.add(extra);
 				Collections.sort(database);
 			}