diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java
index b7214cd..2bc1e3f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java
@@ -221,7 +221,12 @@
 	 *  action's launch history that is not filtered from the menu
 	 */
 	protected ILaunchConfiguration getLastLaunch() {
-		return getLaunchConfigurationManager().getFilteredLastLaunch(getLaunchGroupIdentifier());
+		LaunchConfigurationManager manager = getLaunchConfigurationManager();
+		ILaunchConfiguration configuration = manager.getLastLaunch(getLaunchGroupIdentifier());
+		if (configuration == null) {
+			return manager.getFilteredLastLaunch(getLaunchGroupIdentifier());
+		}
+		return configuration;
 	}
 
 	/**