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 0148738f9..b53e4a696 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java
@@ -90,6 +90,8 @@ public class MotorChooserDialog extends JDialog implements CloseableDialog {
 		
 		// Set the closeable dialog after all initialization
 		selectionPanel.setCloseableDialog(this);
+
+		GUIUtil.setDisposableDialogOptions(this, cancelButton);
 	}
 	
 	public void setMotorMountAndConfig( FlightConfigurationId _fcid, MotorMount _mount ) {