diff --git a/bundles/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java b/bundles/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java
index 99aa6346ac2..9e78d132972 100644
--- a/bundles/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java
+++ b/bundles/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java
@@ -525,7 +525,8 @@ public class LaunchBarManager implements ILaunchBarManager, ILaunchTargetListene
 			}
 		} else {
 			// current active target, check if it is supported
-			if (activeLaunchTarget != null && supportsTarget(activeLaunchDesc, activeLaunchTarget)) {
+			if (activeLaunchTarget != null && activeLaunchTarget != ILaunchTarget.NULL_TARGET
+					&& supportsTarget(activeLaunchDesc, activeLaunchTarget)) {
 				setActiveLaunchTarget(activeLaunchTarget);
 				return;
 			}