diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/Messages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/Messages.java
index 02b1ae0..1e2c29a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/Messages.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/Messages.java
@@ -29,6 +29,8 @@
 
 	public static String TaskWorkingSetPage_The_name_must_not_have_a_leading_or_trailing_whitespace;
 
+	public static String TaskWorkingSetPage_Name;
+
 	public static String TaskWorkingSetPage_No_categories_queries_selected;
 
 	public static String TaskWorkingSetPage_Resources;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java
index 3b1b0a5..26c34c5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java
@@ -26,6 +26,8 @@
 import org.eclipse.core.runtime.PlatformObject;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTreeViewer;
@@ -34,9 +36,12 @@
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.mylyn.internal.provisional.commons.ui.EnhancedFilteredTree;
+import org.eclipse.mylyn.internal.provisional.commons.ui.SubstringPatternFilter;
 import org.eclipse.mylyn.internal.tasks.core.AbstractTaskCategory;
 import org.eclipse.mylyn.internal.tasks.core.AbstractTaskContainer;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
@@ -401,12 +406,13 @@
 		setControl(composite);
 
 		// PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IIDEHelpContextIds.WORKING_SET_RESOURCE_PAGE);
-		Label label = new Label(composite, SWT.WRAP);
-		label.setText(""); //$NON-NLS-1$
-		label.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL
-				| GridData.VERTICAL_ALIGN_CENTER));
 
-		text = new Text(composite, SWT.SINGLE | SWT.BORDER);
+		Composite nameComposite = new Composite(composite, SWT.NONE);
+		GridDataFactory.fillDefaults().applyTo(nameComposite);
+		GridLayoutFactory.fillDefaults().numColumns(2).applyTo(nameComposite);
+		Label nameLabel = new Label(nameComposite, SWT.NONE);
+		nameLabel.setText(Messages.TaskWorkingSetPage_Name);
+		text = new Text(nameComposite, SWT.SINGLE | SWT.BORDER);
 		text.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
 		text.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
@@ -416,12 +422,17 @@
 		text.setFocus();
 		// text.setBackground(FieldAssistColors.getRequiredFieldBackgroundColor(text));
 
-		label = new Label(composite, SWT.WRAP);
+		Label label = new Label(composite, SWT.WRAP);
 		label.setText(""); //$NON-NLS-1$
 		label.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL
 				| GridData.VERTICAL_ALIGN_CENTER));
-
-		treeViewer = new CheckboxTreeViewer(composite);
+		treeViewer = (CheckboxTreeViewer) new EnhancedFilteredTree(composite, SWT.NONE, new SubstringPatternFilter(),
+				true) {
+			@Override
+			protected TreeViewer doCreateTreeViewer(Composite parent, int style) {
+				return new CheckboxTreeViewer(parent, style);
+			}
+		}.getViewer();
 		treeViewer.setUseHashlookup(true);
 		treeViewer.setContentProvider(workingSetPageContentProvider);
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/messages.properties b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/messages.properties
index b590a79..03eee90 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/messages.properties
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/messages.properties
@@ -10,6 +10,7 @@
 ###############################################################################
 TaskWorkingSetPage_The_name_must_not_be_empty=The name must not be empty.
 TaskWorkingSetPage_The_name_must_not_have_a_leading_or_trailing_whitespace=The name must not have a leading or trailing whitespace.
+TaskWorkingSetPage_Name=Name:
 TaskWorkingSetPage_No_categories_queries_selected=No categories/queries selected.
 TaskWorkingSetPage_Resources=Resources
 TaskWorkingSetPage_Select_Working_Set_Elements=Select Working Set Elements