diff --git a/package.json b/package.json
index cc53a439..d595634e 100644
--- a/package.json
+++ b/package.json
@@ -297,7 +297,7 @@
         },
         {
           "command": "vscode-objectscript.modifyWsFolder",
-          "when": "vscode-objectscript.connectActive && workspaceFolderCount != 0"
+          "when": "workspaceFolderCount != 0"
         },
         {
           "command": "vscode-objectscript.openErrorLocation",
@@ -606,7 +606,7 @@
         },
         {
           "command": "vscode-objectscript.modifyWsFolder",
-          "when": "vscode-objectscript.connectActive && resourceScheme =~ /^isfs(-readonly)?$/ && explorerResourceIsRoot && !listMultiSelection",
+          "when": "(!resourceScheme || resourceScheme =~ /^isfs(-readonly)?$/) && explorerResourceIsRoot && !listMultiSelection",
           "group": "objectscript_modify@3"
         },
         {
diff --git a/src/commands/addServerNamespaceToWorkspace.ts b/src/commands/addServerNamespaceToWorkspace.ts
index e5f339e2..f243d919 100644
--- a/src/commands/addServerNamespaceToWorkspace.ts
+++ b/src/commands/addServerNamespaceToWorkspace.ts
@@ -397,13 +397,6 @@ export async function modifyWsFolder(wsFolderUri?: vscode.Uri): Promise<void> {
     if (!wsFolder) {
       return;
     }
-    if (notIsfs(wsFolder.uri)) {
-      vscode.window.showErrorMessage(
-        `Workspace folder '${wsFolder.name}' does not have scheme 'isfs' or 'isfs-readonly'.`,
-        "Dismiss"
-      );
-      return;
-    }
   } else {
     // Find the workspace folder for this uri
     wsFolder = vscode.workspace.getWorkspaceFolder(wsFolderUri);
@@ -411,6 +404,13 @@ export async function modifyWsFolder(wsFolderUri?: vscode.Uri): Promise<void> {
       return;
     }
   }
+  if (notIsfs(wsFolder.uri)) {
+    vscode.window.showErrorMessage(
+      `Workspace folder '${wsFolder.name}' does not have scheme 'isfs' or 'isfs-readonly'.`,
+      "Dismiss"
+    );
+    return;
+  }
 
   // Prompt the user to modify the uri
   const newUri = await modifyWsFolderUri(wsFolder.uri);