diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIMessages.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIMessages.java
index d154032..b8d0b20 100644
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIMessages.java
+++ b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIMessages.java
@@ -404,4 +404,5 @@
 
 	public static String ConfigurationManagerWindow_searchTaskName;
 	public static String FindUpdatesAction_trackedProgress;
+	public static String FindUpdatesAction_allFeaturesSearch;
 }
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPluginResources.properties b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPluginResources.properties
index f5c75de..de01887 100644
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPluginResources.properties
+++ b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/UpdateUIPluginResources.properties
@@ -231,6 +231,7 @@
 
 FindUpdatesAction_updates=Updates
 FindUpdatesAction_trackedProgress={0} {1}: ({2}%)
+FindUpdatesAction_allFeaturesSearch=All Features
 
 InstallationHistoryAction_title=Installation History
 InstallationHistoryAction_desc=The list below represents the history of your update activities from the product installation to date. Each operation carries a date it commenced, as well as activities performed. Operations are sorted by date in ascending order.
diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/FindUpdatesAction.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/FindUpdatesAction.java
index dcc935d..58def8c 100644
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/FindUpdatesAction.java
+++ b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/FindUpdatesAction.java
@@ -129,7 +129,8 @@
 		job.setUser(true);
 		job.setPriority(Job.INTERACTIVE);
 
-		window.trackUpdateJob(job, feature.getLabel());
+		String name = feature!=null?feature.getLabel():UpdateUIMessages.FindUpdatesAction_allFeaturesSearch;
+		window.trackUpdateJob(job, name);
 		InstallWizardOperation operation = new InstallWizardOperation();
 
 		operation.run(window.getShell(), job);