diff --git a/packages/cli/src/commands/workspace.ts b/packages/cli/src/commands/workspace.ts
index 8a25abf44f..5d4e74d0c4 100644
--- a/packages/cli/src/commands/workspace.ts
+++ b/packages/cli/src/commands/workspace.ts
@@ -16,6 +16,9 @@ export const remoteWorkspaceCommand: CommandModule = {
   describe: 'Manage remote workspaces',
   builder: (yargs: Argv) =>
     yargs
+      .middleware((argv) => {
+        argv['isCommand'] = true;
+      })
       .command(defer(listCommand, 'wsr'))
       .command(defer(createCommand, 'wsr'))
       .command(defer(deleteCommand, 'wsr'))
diff --git a/packages/cli/src/ui/commands/workspaceCommand.ts b/packages/cli/src/ui/commands/workspaceCommand.ts
index 9f9f2d7284..23a8234abd 100644
--- a/packages/cli/src/ui/commands/workspaceCommand.ts
+++ b/packages/cli/src/ui/commands/workspaceCommand.ts
@@ -10,7 +10,6 @@ import type { MessageActionReturn } from '@google/gemini-cli-core';
 import { WorkspaceHubClient } from '@google/gemini-cli-core';
 
 const listAction = async (
-   
   _context: CommandContext,
 ): Promise<void | MessageActionReturn> => {
   const hubUrl =
@@ -153,6 +152,7 @@ const deleteCommand: SlashCommand = {
 
 export const workspaceSlashCommand: SlashCommand = {
   name: 'workspace',
+  altNames: ['wsr'],
   description: 'Manage remote workspaces',
   kind: CommandKind.BUILT_IN,
   autoExecute: false,