diff --git a/packages/hoppscotch-common/src/components/collections/TeamCollections.vue b/packages/hoppscotch-common/src/components/collections/TeamCollections.vue
index 211c7e872b..d07fbd9234 100644
--- a/packages/hoppscotch-common/src/components/collections/TeamCollections.vue
+++ b/packages/hoppscotch-common/src/components/collections/TeamCollections.vue
@@ -131,9 +131,9 @@
             "
             @click="
               () => {
-                collectionClicked({
+                handleCollectionClick({
                   collectionID: node.id,
-                  isOpen: isOpen,
+                  isOpen,
                 })
               }
             "
@@ -220,10 +220,10 @@
             "
             @click="
               () => {
-                collectionClicked({
+                handleCollectionClick({
                   // for the folders, we get a path, so we need to get the last part of the path which is the folder id
                   collectionID: node.id.split('/').pop() as string,
-                  isOpen: isOpen,
+                  isOpen,
                 })
               }
             "
@@ -577,7 +577,7 @@ const emit = defineEmits<{
     }
   ): void
   (
-    event: "collection-clicked",
+    event: "collection-click",
     payload: {
       // if the collection is open or not in the tree
       isOpen: boolean
@@ -596,13 +596,15 @@ const getPath = (path: string) => {
   return pathArray.join("/")
 }
 
-const collectionClicked = (payload: {
+const handleCollectionClick = (payload: {
   collectionID: string
   isOpen: boolean
 }) => {
-  emit("collection-clicked", {
-    collectionID: payload.collectionID,
-    isOpen: payload.isOpen,
+  const { collectionID, isOpen } = payload
+
+  emit("collection-click", {
+    collectionID,
+    isOpen,
   })
 }
 
diff --git a/packages/hoppscotch-common/src/components/collections/index.vue b/packages/hoppscotch-common/src/components/collections/index.vue
index 1fc568b93c..9a53a69542 100644
--- a/packages/hoppscotch-common/src/components/collections/index.vue
+++ b/packages/hoppscotch-common/src/components/collections/index.vue
@@ -93,7 +93,7 @@
       @expand-team-collection="expandTeamCollection"
       @display-modal-add="displayModalAdd(true)"
       @display-modal-import-export="displayModalImportExport(true)"
-      @collection-clicked="handleCollectionClick"
+      @collection-click="handleCollectionClick"
     />
     <div
       class="py-15 hidden flex-1 flex-col items-center justify-center bg-primaryDark px-4 text-secondaryLight"
@@ -425,7 +425,7 @@ const handleCollectionClick = (payload: {
 }) => {
   if (
     filterTexts.value.length > 0 &&
-    teamsSearchResults.value &&
+    teamsSearchResults.value.length &&
     payload.isOpen
   ) {
     expandCollection(payload.collectionID)
diff --git a/packages/hoppscotch-common/src/services/spotlight/searchers/teamRequest.searcher.ts b/packages/hoppscotch-common/src/services/spotlight/searchers/teamRequest.searcher.ts
index fa108a4758..8513bb83d3 100644
--- a/packages/hoppscotch-common/src/services/spotlight/searchers/teamRequest.searcher.ts
+++ b/packages/hoppscotch-common/src/services/spotlight/searchers/teamRequest.searcher.ts
@@ -51,11 +51,11 @@ export class TeamsSpotlightSearcherService
     const scopeHandle = effectScope()
 
     scopeHandle.run(() => {
+      const debouncedSearch = debounce(this.teamsSearch.searchTeams, 400)
+
       watch(
         query,
         (query) => {
-          const debouncedSearch = debounce(this.teamsSearch.searchTeams, 400)
-
           if (this.workspaceService.currentWorkspace.value.type === "team") {
             const teamID = this.workspaceService.currentWorkspace.value.teamID
             debouncedSearch(query, teamID)?.catch((_) => {})