diff --git a/src/cmdforge/gui/pages/registry_page.py b/src/cmdforge/gui/pages/registry_page.py
index 2ed6dad..23fe4f4 100644
--- a/src/cmdforge/gui/pages/registry_page.py
+++ b/src/cmdforge/gui/pages/registry_page.py
@@ -32,15 +32,26 @@ class SearchWorker(QThread):
     def run(self):
         try:
             client = RegistryClient()
-            result = client.search_tools(
-                self.query,
-                category=self.category if self.category and self.category != "All" else None,
-                tags=self.tags,
-                page=self.page,
-                per_page=self.per_page,
-                sort=self.sort,
-                include_facets=True
-            )
+            category = self.category if self.category and self.category != "All" else None
+
+            # Use list_tools for browsing (no query/tags), search_tools for searching
+            if not self.query and not self.tags:
+                result = client.list_tools(
+                    category=category,
+                    page=self.page,
+                    per_page=self.per_page,
+                    sort=self.sort
+                )
+            else:
+                result = client.search_tools(
+                    self.query,
+                    category=category,
+                    tags=self.tags,
+                    page=self.page,
+                    per_page=self.per_page,
+                    sort=self.sort,
+                    include_facets=True
+                )
             self.finished.emit(result)
         except Exception as e:
             self.error.emit(str(e))