diff --git a/swing/src/net/sf/openrocket/gui/components/ConfigurationComboBox.java b/swing/src/net/sf/openrocket/gui/components/ConfigurationComboBox.java
index 16eed7a4c..4785570c2 100644
--- a/swing/src/net/sf/openrocket/gui/components/ConfigurationComboBox.java
+++ b/swing/src/net/sf/openrocket/gui/components/ConfigurationComboBox.java
@@ -1,14 +1,17 @@
 package net.sf.openrocket.gui.components;
 
+import java.util.EventObject;
+
 import javax.swing.JComboBox;
 import javax.swing.MutableComboBoxModel;
-import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.ListDataListener;
+import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.PopupMenuListener;
 
-import net.sf.openrocket.rocketcomponent.Rocket;
 import net.sf.openrocket.rocketcomponent.FlightConfiguration;
 import net.sf.openrocket.rocketcomponent.FlightConfigurationId;
+import net.sf.openrocket.rocketcomponent.Rocket;
+import net.sf.openrocket.util.StateChangeListener;
 
 // combobox for flight configurations
 // this is insane -- it appears the only way to reconstruct a
@@ -17,7 +20,7 @@ import net.sf.openrocket.rocketcomponent.FlightConfigurationId;
 // to the combobox or to its model) is to reconstruct the model.  This
 // is done quickly enough I might as well just do it every time the
 // combobox is opened, rather than trying to watch and see if it's needed.
-public class ConfigurationComboBox extends JComboBox<FlightConfiguration> {
+public class ConfigurationComboBox extends JComboBox<FlightConfiguration> implements StateChangeListener {
     public class ConfigurationModel implements MutableComboBoxModel<FlightConfiguration> {
 		
 		private final Rocket rkt;
@@ -77,20 +80,25 @@ public class ConfigurationComboBox extends JComboBox<FlightConfiguration> {
     private final Rocket rkt;
 
     public ConfigurationComboBox(Rocket _rkt) {
-	rkt = _rkt;
-	setModel(new ConfigurationModel(rkt));
-
-	addPopupMenuListener(new PopupMenuListener()
-	    {
-		public void popupMenuCanceled(PopupMenuEvent e) {}
-		public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {}
-		
-		public void popupMenuWillBecomeVisible(PopupMenuEvent e)
-		{
-		    setModel(new ConfigurationModel(rkt));		    
-		}
-		
-	    });
+		rkt = _rkt;
+		setModel(new ConfigurationModel(rkt));
+		rkt.addChangeListener(this);
+	
+		addPopupMenuListener(new PopupMenuListener() {
+			public void popupMenuCanceled(PopupMenuEvent e) {}
+			public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {}
+			
+			public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+			    setModel(new ConfigurationModel(rkt));		    
+			}
+			
+		});
 	
     }
+    
+    @Override
+    public void stateChanged(EventObject e) {
+    	this.repaint();
+    	this.revalidate();
+    }
 }
diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
index 1d46fcc46..1a033a887 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
@@ -8,6 +8,7 @@ import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTable;
+import javax.swing.ListSelectionModel;
 import javax.swing.UIManager;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
@@ -24,6 +25,7 @@ import net.sf.openrocket.formatting.RocketDescriptor;
 import net.sf.openrocket.gui.util.GUIUtil;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.rocketcomponent.ComponentChangeEvent;
+import net.sf.openrocket.rocketcomponent.ComponentChangeListener;
 import net.sf.openrocket.rocketcomponent.FlightConfigurableComponent;
 import net.sf.openrocket.rocketcomponent.FlightConfigurationId;
 import net.sf.openrocket.rocketcomponent.Rocket;
@@ -32,7 +34,7 @@ import net.sf.openrocket.util.Pair;
 
 
 @SuppressWarnings("serial")
-public abstract class FlightConfigurablePanel<T extends FlightConfigurableComponent> extends JPanel {
+public abstract class FlightConfigurablePanel<T extends FlightConfigurableComponent> extends JPanel implements ComponentChangeListener {
 
 	protected static final Translator trans = Application.getTranslator();
 	private static final Logger log = LoggerFactory.getLogger(FlightConfigurablePanel.class);
@@ -46,7 +48,7 @@ public abstract class FlightConfigurablePanel<T extends FlightConfigurableCompon
 		super(new MigLayout("fill"));
 		this.flightConfigurationPanel = flightConfigurationPanel;
 		this.rocket = rocket;
-		table = initializeTable();
+		table = doTableInitialization();
 
 		installTableListener();
 		synchronizeConfigurationSelection();
@@ -54,7 +56,7 @@ public abstract class FlightConfigurablePanel<T extends FlightConfigurableCompon
 
 	public void fireTableDataChanged() {
 		int selectedRow = table.getSelectedRow();
-		int selectedColumn = table.getSelectedColumn();	
+		int selectedColumn = table.getSelectedColumn();
 		this.rocket.fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE);
 		((AbstractTableModel)table.getModel()).fireTableDataChanged();
 		restoreSelection(selectedRow,selectedColumn);
@@ -62,15 +64,41 @@ public abstract class FlightConfigurablePanel<T extends FlightConfigurableCompon
 	}
 
 	protected abstract void updateButtonState();
+	
+	@Override
+	public void componentChanged(ComponentChangeEvent e) {
+		this.synchronizeConfigurationSelection();
+	}
+	
+	/**
+	 * Initialize the table using the specific implementation's initializeTable
+	 * method and then select the row to match what the rocket's current selected
+	 * configuration is.
+	 * 
+	 * @return the JTable created
+	 */
+	private final JTable doTableInitialization() {
+		JTable table = this.initializeTable();
+		FlightConfigurationId current = this.rocket.getSelectedConfiguration().getFlightConfigurationID();
+		int col = (table.getColumnCount() > 1) ? 1 : 0;
+		for (int row = 0; row < table.getRowCount(); row++) {
+			FlightConfigurationId rowFCID = rocket.getId(row);
+			if (rowFCID.equals(current)) {
+				table.changeSelection(row, col, false, false);
+				break;
+			}
+		}
+		return table;
+	}
 
 	protected final void synchronizeConfigurationSelection() {
-		FlightConfigurationId defaultFCID = rocket.getSelectedConfiguration().getFlightConfigurationID();
+		FlightConfigurationId currentRocketFCID = rocket.getSelectedConfiguration().getFlightConfigurationID();
 		FlightConfigurationId selectedFCID = getSelectedConfigurationId();
 		
-		if ( selectedFCID == null ) {
+		if ( currentRocketFCID == FlightConfigurationId.DEFAULT_VALUE_FCID ) {
 			// need to unselect
 			table.clearSelection();
-		} else if ( !defaultFCID.equals(selectedFCID)){			
+		} else if ( !currentRocketFCID.equals(selectedFCID)){			
 			// Need to change selection
 			// We'll select the correct row, in the currently selected column.
 			int col = table.getSelectedColumn();
@@ -80,8 +108,8 @@ public abstract class FlightConfigurablePanel<T extends FlightConfigurableCompon
 			
 			for( int rowNum = 0; rowNum < table.getRowCount(); rowNum++ ) {
 				FlightConfigurationId rowFCID = rocket.getId(rowNum );
-				if ( rowFCID.equals(selectedFCID) ) {
-					table.changeSelection(rowNum, col, true, false);
+				if ( rowFCID.equals(currentRocketFCID) ) {
+					table.changeSelection(rowNum, col, false, false);
 					break;
 				}
 			}
@@ -108,16 +136,21 @@ public abstract class FlightConfigurablePanel<T extends FlightConfigurableCompon
 				if ( e.getValueIsAdjusting() ) {
 					return;
 				}
-//				int firstrow = e.getFirstIndex();
-//				int lastrow = e.getLastIndex();
-//				ListSelectionModel model = (ListSelectionModel) e.getSource();
-//				for( int row = firstrow; row <= lastrow; row ++) {
-//					if ( model.isSelectedIndex(row) ) {
-//						FlightConfigurationID fcid = (FlightConfigurationID) table.getValueAt(row, table.convertColumnIndexToView(0));
-//						FlightConfiguration config = rocket.getConfigurationSet().get(fcid);
-//						return;
-//					}
-//				}
+				
+				/* Find the selected row and set it as the current selected configuration
+				 * for the rocket. This will propagate the event to ensure that other
+				 * pieces of the UI are updated and match the table selection.
+				 */
+				int firstrow = e.getFirstIndex();
+				int lastrow = e.getLastIndex();
+				ListSelectionModel model = (ListSelectionModel) e.getSource();
+				for( int row = firstrow; row <= lastrow; row ++) {
+					if ( model.isSelectedIndex(row) ) {
+						FlightConfigurationId fcid = (FlightConfigurationId) table.getValueAt(row, table.convertColumnIndexToView(0));
+						rocket.setSelectedConfiguration(fcid);
+						return;
+					}
+				}
 			}
 
 		});
diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java
index f5cb45ed3..b89489606 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java
@@ -44,11 +44,6 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 	private final static int RECOVERY_TAB_INDEX = 1;
 	private final static int SEPARATION_TAB_INDEX = 2;
 
-	@Override
-	public void stateChanged(EventObject e) {
-		updateButtonState();
-	}
-
 	public FlightConfigurationPanel(OpenRocketDocument doc) {
 		super(new MigLayout("fill","[grow][][][][][grow]"));
 		
@@ -77,7 +72,12 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 		newConfButton.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
+				
 				addOrCopyConfiguration(false);
+				int lastRow = motorConfigurationPanel.table.getRowCount() - 1;
+				int lastCol = motorConfigurationPanel.table.getColumnCount() - 1;
+				motorConfigurationPanel.table.setRowSelectionInterval(lastRow, lastRow);
+				motorConfigurationPanel.table.setColumnSelectionInterval(lastCol, lastCol);
 				configurationChanged();
 			}
 			
@@ -146,7 +146,7 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 			newConfig = new FlightConfiguration(rocket, null);
 			newId = newConfig.getId();
 		}
-
+		
 		// associate configuration with Id and select it
 		rocket.setFlightConfiguration(newId, newConfig);
 		rocket.setSelectedConfiguration(newId);
@@ -216,4 +216,11 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 
 	}
 	
+	@Override
+	public void stateChanged(EventObject e) {
+		updateButtonState();
+		motorConfigurationPanel.synchronizeConfigurationSelection();
+		recoveryConfigurationPanel.synchronizeConfigurationSelection();
+		separationConfigurationPanel.synchronizeConfigurationSelection();
+	}
 }