diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index c27143c6e..771e6fd42 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -1853,7 +1853,6 @@ DeploymentSelectionDialog.opt.title = Which flight configurations are affected:
 DeploymentSelectionDialog.opt.default = Change the default deployment event for this recovery device
 DeploymentSelectionDialog.opt.override = Override for the {0} flight configuration only
 
-SeparationSelectionDialog.lbl.separation = Stage separation at:
 SeparationSelectionDialog.opt.title = Which flight configurations are affected:
 SeparationSelectionDialog.opt.default = Change the default separation event for this stage
 SeparationSelectionDialog.opt.override = Override for the {0} flight configuration only
diff --git a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java b/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java
index 41d03cb8b..677af167c 100644
--- a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java
+++ b/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java
@@ -61,6 +61,12 @@ public class DeploymentSelectionDialog extends JDialog {
 		buttonGroup.add(defaultButton);
 		buttonGroup.add(overrideButton);
 		
+		// Select the button based on current configuration.  If the configuration is overridden
+		// The the overrideButton is selected.
+		boolean isOverridden = !component.getDeploymentConfiguration().isDefault(id);
+		if (isOverridden) {
+			overrideButton.setSelected(true);
+		}
 		
 		//// Deployment
 		//// Deploys at:
diff --git a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java b/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java
index c0fd12e45..5482f9bca 100644
--- a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java
+++ b/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java
@@ -53,6 +53,13 @@ public class IgnitionSelectionDialog extends JDialog {
 		buttonGroup.add(defaultButton);
 		buttonGroup.add(overrideButton);
 		
+		// Select the button based on current configuration.  If the configuration is overridden
+		// The the overrideButton is selected.
+		boolean isOverridden = !component.getIgnitionConfiguration().isDefault(id);
+		if (isOverridden) {
+			overrideButton.setSelected(true);
+		}
+		
 		// Select ignition event
 		//// Ignition at:
 		panel.add(new JLabel(trans.get("MotorCfg.lbl.Ignitionat")), "");
diff --git a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java b/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java
index daf6afddb..8bb6da506 100644
--- a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java
+++ b/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java
@@ -4,11 +4,13 @@ import java.awt.Dialog;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.swing.ButtonGroup;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.JRadioButton;
 import javax.swing.JSpinner;
 
 import net.miginfocom.swing.MigLayout;
@@ -36,13 +38,28 @@ public class SeparationSelectionDialog extends JDialog {
 		
 		newConfiguration = component.getStageSeparationConfiguration().get(id).clone();
 		
-		
 		JPanel panel = new JPanel(new MigLayout("fill"));
 		
-		// FIXME: Edit Default or override option
-		
 		// Select separation event
-		panel.add(new JLabel(trans.get("SeparationSelectionDialog.lbl.separation")), "");
+		panel.add(new JLabel(trans.get("SeparationSelectionDialog.opt.title")), "span, wrap rel");
+		
+		final JRadioButton defaultButton = new JRadioButton(trans.get("SeparationSelectionDialog.opt.default"), true);
+		panel.add(defaultButton, "span, gapleft para, wrap rel");
+		String str = trans.get("SeparationSelectionDialog.opt.override");
+		str = str.replace("{0}", rocket.getFlightConfigurationNameOrDescription(id));
+		final JRadioButton overrideButton = new JRadioButton(str, false);
+		panel.add(overrideButton, "span, gapleft para, wrap para");
+		
+		ButtonGroup buttonGroup = new ButtonGroup();
+		buttonGroup.add(defaultButton);
+		buttonGroup.add(overrideButton);
+		
+		// Select the button based on current configuration.  If the configuration is overridden
+		// The the overrideButton is selected.
+		boolean isOverridden = !component.getStageSeparationConfiguration().isDefault(id);
+		if (isOverridden) {
+			overrideButton.setSelected(true);
+		}
 		
 		final JComboBox event = new JComboBox(new EnumModel<SeparationEvent>(newConfiguration, "SeparationEvent"));
 		event.setSelectedItem(newConfiguration.getSeparationEvent());
@@ -66,7 +83,11 @@ public class SeparationSelectionDialog extends JDialog {
 		okButton.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				component.getStageSeparationConfiguration().set(id, newConfiguration);
+				if (defaultButton.isSelected()) {
+					component.getStageSeparationConfiguration().setDefault(newConfiguration);
+				} else {
+					component.getStageSeparationConfiguration().set(id, newConfiguration);
+				}
 				SeparationSelectionDialog.this.setVisible(false);
 			}
 		});