diff --git a/packages/app/src/app/context/workspace.ts b/packages/app/src/app/context/workspace.ts
index 98ed9cf4d..02a354aa2 100644
--- a/packages/app/src/app/context/workspace.ts
+++ b/packages/app/src/app/context/workspace.ts
@@ -396,7 +396,8 @@ export function createWorkspaceStore(options: {
       options.setPendingPermissions([]);
       options.setSessionStatusById({});
 
-      if (context?.workspaceType === "remote" && targetRoot) {
+      // Load workspace templates for all workspace types (local and remote)
+      if (targetRoot) {
         await options
           .loadWorkspaceTemplates({ workspaceRoot: targetRoot, quiet: true })
           .catch(() => undefined);