diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx
index d641ad7d5..cbe1880de 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx
@@ -423,7 +423,21 @@ export function SearchModal({
           }
           break
         case 'workspace':
+          if (item.isCurrent) {
+            break
+          }
+          if (item.href) {
+            router.push(item.href)
+          }
+          break
         case 'workflow':
+          if (!item.isCurrent && item.href) {
+            router.push(item.href)
+            window.dispatchEvent(
+              new CustomEvent(SIDEBAR_SCROLL_EVENT, { detail: { itemId: item.id } })
+            )
+          }
+          break
         case 'page':
         case 'doc':
           if (item.href) {
@@ -431,12 +445,6 @@ export function SearchModal({
               window.open(item.href, '_blank', 'noopener,noreferrer')
             } else {
               router.push(item.href)
-              // Scroll to the workflow in the sidebar after navigation
-              if (item.type === 'workflow') {
-                window.dispatchEvent(
-                  new CustomEvent(SIDEBAR_SCROLL_EVENT, { detail: { itemId: item.id } })
-                )
-              }
             }
           }
           break