diff --git a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java b/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java
index 66de63199..ecb9d3b33 100644
--- a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java
+++ b/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java
@@ -87,10 +87,15 @@ public class MotorConfigurationPanel extends JPanel {
 			@Override
 			public void mouseClicked(MouseEvent e) {
 				updateButtonState();
+				int selectedColumn = configurationTable.getSelectedColumn();
 				if (e.getClickCount() == 2) {
-					// FIXME:  Double-click on ignition column should select ignition
-					// Double-click edits motor
-					selectMotor();
+					if (selectedColumn == 2) {
+						// user double clicked in ignition column
+						selectIgnition();
+					} else {
+						// Double-click edits motor
+						selectMotor();
+					}
 				}
 			}
 		});