diff --git a/.gitignore b/.gitignore
index 98ce20189..3b0822153 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,7 @@
 # User-specific stuff:
 .idea/workspace.xml
 .idea/tasks.xml
+.idea/shelf
 .idea/dictionaries
 .idea/vcs.xml
 .idea/jsLibraryMappings.xml
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
index da24d6c90..bbcf8f8d3 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
@@ -171,8 +171,10 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 
 		// Stage and motor selection:
 		//// Active stages:
+		StageSelector stageSelector = new StageSelector(rkt);
+		rkt.addChangeListener(stageSelector);
 		panel.add(new JLabel(trans.get("componentanalysisdlg.lbl.activestages")), "spanx, split, gapafter rel");
-		panel.add(new StageSelector( rkt), "gapafter paragraph");
+		panel.add(stageSelector, "gapafter paragraph");
 
 		//// Motor configuration:
 		JLabel label = new JLabel(trans.get("componentanalysisdlg.lbl.motorconf"));