diff --git a/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java b/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
index febe7b5fd..6ac1b7892 100644
--- a/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
+++ b/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
@@ -267,13 +267,17 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
 			gl.glDisable(GLLightingFunc.GL_LIGHTING);
 			final RocketComponent picked = rr.pick(drawable, configuration,
 					pickPoint, pickEvent.isShiftDown() ? selection : null);
-			if (csl != null && picked != null) {
+			if (csl != null) {
 				final MouseEvent e = pickEvent;
 				SwingUtilities.invokeLater(new Runnable() {
 					@Override
 					public void run() {
-						csl.componentClicked(new RocketComponent[] { picked },
-								e);
+						if ( picked == null ){
+							log.debug("unselecting");
+							csl.componentClicked(new RocketComponent[] { }, e);
+						} else {
+							csl.componentClicked(new RocketComponent[] { picked }, e);
+						}
 					}
 				});