diff --git a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/controls/ModeSelector.java b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/controls/ModeSelector.java
index b44e8bb3cb4..9bee28361ac 100644
--- a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/controls/ModeSelector.java
+++ b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/controls/ModeSelector.java
@@ -225,7 +225,7 @@ public class ModeSelector extends CSelector {
 	}
 
 	private void updateLaunchButton(ToolItem toolItem) {
-		if (toolItem == null) {
+		if (toolItem == null || isDisposed()) {
 			return;
 		}
 		toolItem.setImage(Activator.getDefault().getImage(Activator.IMG_BUTTON_LAUNCH));
diff --git a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/controls/TargetSelector.java b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/controls/TargetSelector.java
index cc19b25bc2a..ead2d16d02c 100644
--- a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/controls/TargetSelector.java
+++ b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/controls/TargetSelector.java
@@ -261,6 +261,8 @@ public class TargetSelector extends CSelector implements ILaunchTargetListener {
 
 	@Override
 	public void setSelection(Object element) {
+		if (isDisposed())
+			return;
 		if (element == null) {
 			element = noTargets[0];
 		} else if (element instanceof ILaunchTarget) {