diff --git a/lib/tool_shed/util/shed_index.py b/lib/tool_shed/util/shed_index.py
index ee94d4c1a785..11faf5d9c8c2 100644
--- a/lib/tool_shed/util/shed_index.py
+++ b/lib/tool_shed/util/shed_index.py
@@ -56,6 +56,8 @@ def build_index(whoosh_index_dir, file_path, hgweb_config_dir, hgweb_repo_prefix
     execution_timer = ExecutionTimer()
     with repo_index.searcher() as searcher:
         for repo in get_repos(sa_session, file_path, hgweb_config_dir, hgweb_repo_prefix, **kwargs):
+            if repo is None:
+                continue
             tools_list = repo.pop("tools_list")
             repo_id = repo["id"]
             indexed_document = searcher.document(id=repo_id)
@@ -119,9 +121,11 @@ def get_repos(sa_session, file_path, hgweb_config_dir, hgweb_repo_prefix, **kwar
         full_last_updated = repo.update_time.strftime("%Y-%m-%d %I:%M %p")
 
         # Load all changesets of the repo for lineage.
-        repo_path = os.path.join(
-            hgweb_config_dir, hgwcm.get_entry(os.path.join(hgweb_repo_prefix, repo.user.username, repo.name))
-        )
+        try:
+            entry = hgwcm.get_entry(os.path.join(hgweb_repo_prefix, repo.user.username, repo.name))
+        except Exception:
+            return None
+        repo_path = os.path.join(hgweb_config_dir, entry)
         hg_repo = hg.repository(ui.ui(), repo_path.encode("utf-8"))
         lineage = []
         for changeset in hg_repo.changelog:
diff --git a/lib/tool_shed/webapp/frontend/src/components/RepositoriesGrid.vue b/lib/tool_shed/webapp/frontend/src/components/RepositoriesGrid.vue
index f68dab181613..972677babae9 100644
--- a/lib/tool_shed/webapp/frontend/src/components/RepositoriesGrid.vue
+++ b/lib/tool_shed/webapp/frontend/src/components/RepositoriesGrid.vue
@@ -14,6 +14,7 @@ interface RepositoriesGridProps {
     rows: Array<RepositoryGridItem>
     noDataLabel?: string
     debug?: boolean
+    allowSearch?: boolean
 }
 
 interface ScrollDetails {
@@ -29,6 +30,7 @@ const compProps = withDefaults(defineProps<RepositoriesGridProps>(), {
     debug: false,
     onScroll: null as OnScroll | null,
     noDataLabel: "No repositories found",
+    allowSearch: false,
 })
 
 const pagination = { rowsPerPage: 0 }
@@ -44,7 +46,7 @@ const NAME_COLUMN: QTableColumn = {
     name: "name",
     label: "Name",
     align: "left",
-    field: "name",
+    field: "effectiveName",
 }
 
 const columns = computed(() => {
@@ -71,10 +73,14 @@ async function onVirtualScroll(details: ScrollDetails) {
     }
 }
 
+const search = ref("")
+
 // Adapt the rows with doubleIndex so
 const adaptedRows = computed(() =>
     compProps.rows.map((r) => {
-        return { doubleIndex: r.index * 2, ...r }
+        // create this effective name so we are filtering on this when searching...
+        const effectiveName = r.owner + " " + r.name
+        return { doubleIndex: r.index * 2, effectiveName: effectiveName, ...r }
     })
 )
 </script>
@@ -83,10 +89,10 @@ const adaptedRows = computed(() =>
         <q-table
             v-if="loading || rows.length > 0"
             style="height: 85vh"
-            :title="title"
             :rows="adaptedRows"
             :columns="columns"
             :loading="tableLoading"
+            :filter="search"
             row-key="newIndex"
             virtual-scroll
             :virtual-scroll-item-size="48"
@@ -98,6 +104,16 @@ const adaptedRows = computed(() =>
             hide-header
             hide-bottom
         >
+            <template #top>
+                <div class="row col-12">
+                    <div class="q-table__control col-8">
+                        <div class="q-table__title">{{ title }}</div>
+                    </div>
+                    <div class="col-4 justify-end q-pa-md" v-if="allowSearch">
+                        <q-input v-model="search" autogrow label="Filter"></q-input>
+                    </div>
+                </div>
+            </template>
             <template #body="props">
                 <q-tr :props="props" :key="`m_${props.row.index}`">
                     <q-td v-for="col in props.cols" :key="col.name" :props="props">
diff --git a/lib/tool_shed/webapp/frontend/src/components/pages/RepositoriesByCategory.vue b/lib/tool_shed/webapp/frontend/src/components/pages/RepositoriesByCategory.vue
index 899341171af9..cb3046247e07 100644
--- a/lib/tool_shed/webapp/frontend/src/components/pages/RepositoriesByCategory.vue
+++ b/lib/tool_shed/webapp/frontend/src/components/pages/RepositoriesByCategory.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import { computed } from "vue"
+import { computed, ref } from "vue"
 import { useCategoriesStore } from "@/stores"
 import RepositoriesGrid from "@/components/RepositoriesGrid.vue"
-import { nodeToRow } from "@/components/RepositoriesGridInterface"
+import { nodeToRow, type RepositoryGridItem } from "@/components/RepositoriesGridInterface"
 import ErrorBanner from "@/components/ErrorBanner.vue"
 import LoadingDiv from "@/components/LoadingDiv.vue"
 import { graphql } from "@/gql"
@@ -67,6 +67,11 @@ const rows = computed(() => {
     <loading-div v-if="loading" />
     <error-banner error="Failed to load repository" v-else-if="error"> </error-banner>
     <q-page class="q-pa-md" v-if="categoryName">
-        <repositories-grid :title="`Repositories for ${categoryName}`" :rows="rows" :on-scroll="onScroll" />
+        <repositories-grid
+            :title="`Repositories for ${categoryName}`"
+            :rows="rows"
+            :on-scroll="onScroll"
+            :allow-search="true"
+        />
     </q-page>
 </template>
diff --git a/lib/tool_shed/webapp/frontend/src/components/pages/RepositoriesBySearch.vue b/lib/tool_shed/webapp/frontend/src/components/pages/RepositoriesBySearch.vue
index f98aec5f0007..bf8ca25559f3 100644
--- a/lib/tool_shed/webapp/frontend/src/components/pages/RepositoriesBySearch.vue
+++ b/lib/tool_shed/webapp/frontend/src/components/pages/RepositoriesBySearch.vue
@@ -8,6 +8,7 @@ import { notifyOnCatch } from "@/util"
 
 const query = ref("")
 const page = ref(1)
+const searching = ref(false)
 const fetchedLastPage = ref(false)
 const hits = ref([] as Array<RepositorySearchHit>)
 
@@ -15,7 +16,11 @@ type RepositorySearchHit = components["schemas"]["RepositorySearchHit"]
 
 async function doQuery() {
     const queryValue = query.value
-
+    if (!queryValue) {
+        hits.value = []
+        return
+    }
+    searching.value = true
     try {
         const { data } = await ToolShedApi().GET("/api/repositories", {
             params: {
@@ -39,10 +44,12 @@ async function doQuery() {
             }
             page.value = page.value + 1
         } else {
-            throw Error("Server response structure error.")
+            throw Error("Server response structure error for [" + queryValue + "]")
         }
     } catch (e) {
         notifyOnCatch(e)
+    } finally {
+        searching.value = false
     }
 }
 
@@ -88,12 +95,26 @@ function rowsFunc() {
     return rows
 }*/
 
+const noDataLabel = computed<string>(() => {
+    if (searching.value) {
+        return "Searching..."
+    } else {
+        return "No repositories matching query"
+    }
+})
+
 const rows = realRows
 </script>
 <template>
     <page-container>
         <q-input debounce="20" filled v-model="query" label="Search Repositories" />
-        <repository-grid v-if="query && query.length > 1" :rows="rows" title="Search Results" :on-scroll="OnScrollImpl">
+        <repository-grid
+            v-if="query && query.length > 1"
+            :rows="rows"
+            title="Search Results"
+            :on-scroll="OnScrollImpl"
+            :no-data-label="noDataLabel"
+        >
         </repository-grid>
     </page-container>
 </template>