diff --git a/core/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java b/core/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
index f262b4036..e5ff449b9 100644
--- a/core/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
+++ b/core/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
@@ -62,6 +62,7 @@ import net.sf.openrocket.masscalc.BasicMassCalculator;
 import net.sf.openrocket.masscalc.MassCalculator;
 import net.sf.openrocket.masscalc.MassCalculator.MassCalcType;
 import net.sf.openrocket.rocketcomponent.ComponentChangeEvent;
+import net.sf.openrocket.rocketcomponent.ComponentChangeListener;
 import net.sf.openrocket.rocketcomponent.Configuration;
 import net.sf.openrocket.rocketcomponent.Rocket;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
@@ -214,6 +215,14 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
 		configuration.addChangeListener(new StateChangeListener() {
 			@Override
 			public void stateChanged(EventObject e) {
+				updateExtras();
+				updateFigures();
+			}
+		});
+		
+		document.getRocket().addComponentChangeListener(new ComponentChangeListener() {
+			@Override
+			public void componentChanged(ComponentChangeEvent e) {
 				// System.out.println("Configuration changed, calling updateFigure");
 				if (is3d) {
 					if (e instanceof ComponentChangeEvent) {
@@ -222,8 +231,6 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
 						}
 					}
 				}
-				updateExtras();
-				updateFigures();
 			}
 		});