diff --git a/bundles/org.eclipse.launchbar.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
index 6114714257c..17cfb7b85e1 100644
--- a/bundles/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: LaunchBar Core
 Bundle-SymbolicName: org.eclipse.launchbar.core;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.qualifier
 Bundle-Activator: org.eclipse.launchbar.core.internal.Activator
 Bundle-Vendor: Eclipse CDT
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/bundles/org.eclipse.launchbar.core/pom.xml b/bundles/org.eclipse.launchbar.core/pom.xml
index 66f9d66550d..c91c8db4b1d 100644
--- a/bundles/org.eclipse.launchbar.core/pom.xml
+++ b/bundles/org.eclipse.launchbar.core/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<artifactId>org.eclipse.launchbar.core</artifactId>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>2.1.1-SNAPSHOT</version>
 
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF b/bundles/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF
index a872488efe2..77965c7a60d 100644
--- a/bundles/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.launchbar.ui.controls/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Launch Bar UI Controls
 Bundle-SymbolicName: org.eclipse.launchbar.ui.controls;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
 Bundle-Activator: org.eclipse.launchbar.ui.controls.internal.Activator
 Bundle-Vendor: Eclipse CDT
 Require-Bundle: org.eclipse.osgi.services;bundle-version="3.5.0",
diff --git a/bundles/org.eclipse.launchbar.ui.controls/pom.xml b/bundles/org.eclipse.launchbar.ui.controls/pom.xml
index 5d02eb5e7c8..ef9c1ef3410 100644
--- a/bundles/org.eclipse.launchbar.ui.controls/pom.xml
+++ b/bundles/org.eclipse.launchbar.ui.controls/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<artifactId>org.eclipse.launchbar.ui.controls</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.0.1-SNAPSHOT</version>
 
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarControl.java b/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarControl.java
index d4ace4c2e3b..f096bfd15c9 100644
--- a/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarControl.java
+++ b/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarControl.java
@@ -112,6 +112,10 @@ public class LaunchBarControl implements ILaunchBarListener {
 	}
 
 	private void createTargetSelector() {
+		if (container.isDisposed()) {
+			return;
+		}
+
 		onLabel = new Label(container, SWT.NONE);
 		onLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 		onLabel.setText(Messages.LaunchBarControl_0 + ":"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.launchbar.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.launchbar.ui/META-INF/MANIFEST.MF
index 3ad1121a898..d29431beb28 100644
--- a/bundles/org.eclipse.launchbar.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.launchbar.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: LaunchBar UI
 Bundle-SymbolicName: org.eclipse.launchbar.ui;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 2.1.1.qualifier
 Bundle-Activator: org.eclipse.launchbar.ui.internal.Activator
 Bundle-Vendor: Eclipse CDT
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/bundles/org.eclipse.launchbar.ui/pom.xml b/bundles/org.eclipse.launchbar.ui/pom.xml
index 0fe05f35edb..552f28d2140 100644
--- a/bundles/org.eclipse.launchbar.ui/pom.xml
+++ b/bundles/org.eclipse.launchbar.ui/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<artifactId>org.eclipse.launchbar.ui</artifactId>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>2.1.1-SNAPSHOT</version>
 
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/features/org.eclipse.launchbar/feature.xml b/features/org.eclipse.launchbar/feature.xml
index 9d16c635164..40177a125da 100644
--- a/features/org.eclipse.launchbar/feature.xml
+++ b/features/org.eclipse.launchbar/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.launchbar"
       label="%featureName"
-      version="2.1.0.qualifier"
+      version="2.1.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.launchbar/pom.xml b/features/org.eclipse.launchbar/pom.xml
index 24c785f07f4..39533d10ad8 100644
--- a/features/org.eclipse.launchbar/pom.xml
+++ b/features/org.eclipse.launchbar/pom.xml
@@ -13,7 +13,7 @@
 
 	<groupId>org.eclipse.launchbar.features</groupId>
 	<artifactId>org.eclipse.launchbar</artifactId>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>2.1.1-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 
 	<build>