diff --git a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigEditPage.java b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigEditPage.java
index 9e32ba076a0..2c6f50cc5a7 100644
--- a/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigEditPage.java
+++ b/bundles/org.eclipse.launchbar.ui/src/org/eclipse/launchbar/ui/internal/dialogs/NewLaunchConfigEditPage.java
@@ -83,7 +83,9 @@ public class NewLaunchConfigEditPage extends WizardPage implements IPageChanging
 
 	@Override
 	public void handlePageChanging(PageChangingEvent event) {
-		if (launchConfigType == null) {
+		if (launchConfigType == null || event.getTargetPage() != this) {
+			if (tabViewer != null)
+				tabViewer.setInput(null);
 			return;
 		}
 		LaunchConfigurationsDialog.setCurrentlyVisibleLaunchConfigurationDialog(launchConfigurationDialog);
@@ -186,6 +188,11 @@ public class NewLaunchConfigEditPage extends WizardPage implements IPageChanging
 		public void setTabViewer(LaunchConfigurationTabGroupViewer viewer) {
 			super.setTabViewer(viewer);
 		}
+
+		@Override
+		public boolean isTreeSelectionEmpty() {
+			return false;
+		}
 	}
 
 	private class LaunchConfigurationTabGroupViewerExt extends LaunchConfigurationTabGroupViewer {