diff --git a/xml/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogTreeViewerBuilder.java b/xml/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogTreeViewerBuilder.java
index a455f69..9c972db 100644
--- a/xml/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogTreeViewerBuilder.java
+++ b/xml/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogTreeViewerBuilder.java
@@ -75,7 +75,9 @@
 	}
 	
 	public TreeViewer create() {
-		fTree = new FilteredTree(fParent, SWT.MULTI, new PatternFilter(), true, false);
+		PatternFilter filter = new PatternFilter();
+		filter.setIncludeLeadingWildcard(true);
+		fTree = new FilteredTree(fParent, SWT.MULTI, filter, true, false);
 		fTreeViewer = fTree.getViewer();
 
 		fTreeViewer.setContentProvider(new CatalogEntryContentProvider());
diff --git a/xml/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/SelectXMLCatalogIdPanel.java b/xml/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/SelectXMLCatalogIdPanel.java
index 55d435f..e9db17a 100644
--- a/xml/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/SelectXMLCatalogIdPanel.java
+++ b/xml/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/SelectXMLCatalogIdPanel.java
@@ -93,12 +93,12 @@
 		columnProperties[1] = XMLUIMessages._UI_LABEL_URI;
 
 		FilteredTree viewerCreator = new FilteredTree(parent, SWT.FULL_SELECTION | SWT.BORDER, new PatternFilter(), true, true);
+		viewerCreator.getPatternFilter().setIncludeLeadingWildcard(true);
 		viewerCreator.getViewer().setContentProvider(new XMLCatalogEntryContentProvider());
 		viewerCreator.getViewer().setLabelProvider(new XMLCatalogEntryLabelProvider());
 
 		viewerCreator.getViewer().getTree().setLinesVisible(true);
 		viewerCreator.getViewer().getTree().setHeaderVisible(true);
-		viewerCreator.getViewer().getTree().setLinesVisible(true);
 
 		TableLayout layout = new TableLayout();
 		for (int i = 0; i < columnProperties.length; i++) {