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 e827d52c7..c50317f9d 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
@@ -243,14 +243,22 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
 				@Override
 				public void actionPerformed(ActionEvent e) {
 					((SwingPreferences) Application.getPreferences()).setMotorNameColumn(false);
+					int selectedRow = table.getSelectedRow();
 					model.fireTableDataChanged();
+					if (selectedRow >= 0) {
+						table.setRowSelectionInterval(selectedRow, selectedRow);
+					}
 				}
 			});
 			designation.addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent e) {
 					((SwingPreferences) Application.getPreferences()).setMotorNameColumn(true);
+					int selectedRow = table.getSelectedRow();
 					model.fireTableDataChanged();
+					if (selectedRow >= 0) {
+						table.setRowSelectionInterval(selectedRow, selectedRow);
+					}
 				}
 			});