diff --git a/web/src/cde-gitness/components/GitspaceListing/ListGitspaces.tsx b/web/src/cde-gitness/components/GitspaceListing/ListGitspaces.tsx
index 94a208c377..802eb907e0 100644
--- a/web/src/cde-gitness/components/GitspaceListing/ListGitspaces.tsx
+++ b/web/src/cde-gitness/components/GitspaceListing/ListGitspaces.tsx
@@ -389,8 +389,9 @@ const ActionMenu = ({
               e.stopPropagation()
               if (ide === IDEType.VSCODE) {
                 const params = standalone ? '?gitness' : ''
+                const projectOrSpace = standalone ? space_path : projectIdentifier
                 const vscodeExtensionCode = standalone ? 'harness-inc.oss-gitspaces' : 'harness-inc.gitspaces'
-                const vsCodeURL = `vscode://${vscodeExtensionCode}/${projectIdentifier}/${identifier}${params}`
+                const vsCodeURL = `vscode://${vscodeExtensionCode}/${projectOrSpace}/${identifier}${params}`
                 window.open(vsCodeURL, '_blank')
               } else {
                 if (standalone) {
@@ -761,8 +762,9 @@ export const ListGitspaces = ({ data, refreshList }: { data: TypesGitspaceConfig
             if (row?.state === GitspaceStatus.RUNNING) {
               if (row?.ide === IDEType.VSCODE) {
                 const params = standalone ? '?gitness' : ''
+                const projectOrSpace = standalone ? row?.space_path : projectIdentifier
                 const vscodeExtensionCode = standalone ? 'harness-inc.oss-gitspaces' : 'harness-inc.gitspaces'
-                const vsCodeURL = `vscode://${vscodeExtensionCode}/${projectIdentifier}/${row?.identifier}${params}`
+                const vsCodeURL = `vscode://${vscodeExtensionCode}/${projectOrSpace}/${row?.identifier}${params}`
                 window.open(vsCodeURL, '_blank')
               } else {
                 if (standalone) {
diff --git a/web/src/cde-gitness/pages/GitspaceDetails/GitspaceDetails.tsx b/web/src/cde-gitness/pages/GitspaceDetails/GitspaceDetails.tsx
index ca8c0945b1..41aff11221 100644
--- a/web/src/cde-gitness/pages/GitspaceDetails/GitspaceDetails.tsx
+++ b/web/src/cde-gitness/pages/GitspaceDetails/GitspaceDetails.tsx
@@ -128,14 +128,16 @@ const GitspaceDetails = () => {
       }
     },
     {
-      pollingInterval: 10000,
+      pollingInterval: standalone ? 2000 : 10000,
       startCondition: Boolean(startPolling) || !pollingCondition
     }
   )
 
   usePolling(
     async () => {
-      await refetchLogsData()
+      if (!standalone) {
+        await refetchLogsData()
+      }
     },
     {
       pollingInterval: 10000,
@@ -346,8 +348,9 @@ const GitspaceDetails = () => {
                     e.stopPropagation()
                     if (data?.ide === StandaloneIDEType.VSCODE) {
                       const params = standalone ? '?gitness' : ''
+                      const projectOrSpace = standalone ? space : projectIdentifier
                       const vscodeExtensionCode = standalone ? 'harness-inc.oss-gitspaces' : 'harness-inc.gitspaces'
-                      const vsCodeURL = `vscode://${vscodeExtensionCode}/${projectIdentifier}/${data?.identifier}${params}`
+                      const vsCodeURL = `vscode://${vscodeExtensionCode}/${projectOrSpace}/${data?.identifier}${params}`
                       window.open(vsCodeURL, '_blank')
                     } else {
                       if (standalone) {