diff --git a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/controls/CSelector.java b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/controls/CSelector.java
index b98b5ccc911..cf84e2733fb 100644
--- a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/controls/CSelector.java
+++ b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/controls/CSelector.java
@@ -464,10 +464,10 @@ public abstract class CSelector extends Composite {
 		if (buttonComposite != null) {
 			buttonComposite.setToolTipText(toolTipText);
 		}
-		if (currentLabel != null) {
+		if (currentLabel != null && !currentLabel.isDisposed()) {
 			currentLabel.setToolTipText(toolTipText);
 		}
-		if (currentIcon != null) {
+		if (currentIcon != null && !currentIcon.isDisposed()) {
 			currentIcon.setToolTipText(toolTipText);
 		}
 	}