diff --git a/packages/amazonq/.changes/next-release/Bug Fix-c6521d8e-639d-4672-b5fb-354c91c526be.json b/packages/amazonq/.changes/next-release/Bug Fix-c6521d8e-639d-4672-b5fb-354c91c526be.json
new file mode 100644
index 00000000000..6d3a97660f2
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Bug Fix-c6521d8e-639d-4672-b5fb-354c91c526be.json	
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "\"failed to run command\" error"
+}
diff --git a/packages/amazonq/src/lsp/chat/commands.ts b/packages/amazonq/src/lsp/chat/commands.ts
index 3febc748442..dd495d1bfbf 100644
--- a/packages/amazonq/src/lsp/chat/commands.ts
+++ b/packages/amazonq/src/lsp/chat/commands.ts
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as vscode from 'vscode'
 import { Commands, globals } from 'aws-core-vscode/shared'
 import { window } from 'vscode'
 import { AmazonQChatViewProvider } from './webviewProvider'
@@ -74,6 +73,6 @@ function registerGenericCommand(commandName: string, genericCommand: string, pro
  * Instead, we just create our own as a temporary solution
  */
 async function focusAmazonQPanel() {
-    await vscode.commands.executeCommand('aws.amazonq.AmazonQChatView.focus')
-    await vscode.commands.executeCommand('aws.amazonq.AmazonCommonAuth.focus')
+    await Commands.tryExecute('aws.amazonq.AmazonQChatView.focus')
+    await Commands.tryExecute('aws.amazonq.AmazonCommonAuth.focus')
 }
diff --git a/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts b/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
index 79c52c4872a..bdf73eada07 100644
--- a/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
+++ b/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
@@ -42,7 +42,7 @@ import { AuthUtil } from '../../../codewhisperer/util/authUtil'
 import { AuthController } from '../../../amazonq/auth/controller'
 import { getLogger } from '../../../shared/logger/logger'
 import { submitFeedback } from '../../../feedback/vue/submitFeedback'
-import { placeholder } from '../../../shared/vscode/commands2'
+import { Commands, placeholder } from '../../../shared/vscode/commands2'
 import { EditorContentController } from '../../../amazonq/commons/controllers/contentController'
 import { openUrl } from '../../../shared/utilities/vsCodeUtils'
 import { checkForDevFile, getPathsFromZipFilePath } from '../../../amazonq/util/files'
@@ -579,7 +579,7 @@ export class FeatureDevController {
                         open
                     )
                     if (resp === open) {
-                        await vscode.commands.executeCommand('aws.amazonq.AmazonQChatView.focus')
+                        await Commands.tryExecute('aws.amazonq.AmazonQChatView.focus')
                         // TODO add focusing on the specific tab once that's implemented
                     }
                 }
diff --git a/packages/core/src/codewhispererChat/commands/registerCommands.ts b/packages/core/src/codewhispererChat/commands/registerCommands.ts
index dd9f50d7a48..39d8383c867 100644
--- a/packages/core/src/codewhispererChat/commands/registerCommands.ts
+++ b/packages/core/src/codewhispererChat/commands/registerCommands.ts
@@ -7,7 +7,6 @@ import { commandPalette } from '../../codewhisperer/commands/types'
 import { CodeScanIssue } from '../../codewhisperer/models/model'
 import { Commands, VsCodeCommandArg, placeholder } from '../../shared/vscode/commands2'
 import { ChatControllerMessagePublishers } from '../controllers/chat/controller'
-import vscode from 'vscode'
 
 /**
  * Opens the Amazon Q panel, showing the correct View that should
@@ -25,8 +24,8 @@ export const focusAmazonQPanel = Commands.declare(
          * So when we try to focus the following Views, only one will show depending
          * on the context.
          */
-        await vscode.commands.executeCommand('aws.amazonq.AmazonQChatView.focus')
-        await vscode.commands.executeCommand('aws.amazonq.AmazonCommonAuth.focus')
+        await Commands.tryExecute('aws.amazonq.AmazonQChatView.focus')
+        await Commands.tryExecute('aws.amazonq.AmazonCommonAuth.focus')
     }
 )