diff --git a/packages/amazonq/src/app/inline/activation.ts b/packages/amazonq/src/app/inline/activation.ts
index 4fc296c1ac4..63038e0fd3c 100644
--- a/packages/amazonq/src/app/inline/activation.ts
+++ b/packages/amazonq/src/app/inline/activation.ts
@@ -5,6 +5,7 @@
 
 import vscode from 'vscode'
 import {
+    acceptSuggestion,
     AuthUtil,
     CodeSuggestionsState,
     CodeWhispererCodeCoverageTracker,
@@ -61,6 +62,7 @@ export async function activate(languageClient: LanguageClient) {
          * Automated trigger
          */
         globals.context.subscriptions.push(
+            acceptSuggestion.register(globals.context),
             vscode.window.onDidChangeActiveTextEditor(async (editor) => {
                 await RecommendationHandler.instance.onEditorChange()
             }),
diff --git a/packages/core/src/codewhisperer/commands/onInlineAcceptance.ts b/packages/core/src/codewhisperer/commands/onInlineAcceptance.ts
index 50af478ba57..d193af056f7 100644
--- a/packages/core/src/codewhisperer/commands/onInlineAcceptance.ts
+++ b/packages/core/src/codewhisperer/commands/onInlineAcceptance.ts
@@ -15,7 +15,6 @@ import { sleep } from '../../shared/utilities/timeoutUtils'
 import { handleExtraBrackets } from '../util/closingBracketUtil'
 import { Commands } from '../../shared/vscode/commands2'
 import { isInlineCompletionEnabled } from '../util/commonUtil'
-import { ExtContext } from '../../shared/extensions'
 import { onAcceptance } from './onAcceptance'
 import * as codewhispererClient from '../client/codewhisperer'
 import {
@@ -36,7 +35,7 @@ import { UserWrittenCodeTracker } from '../tracker/userWrittenCodeTracker'
 
 export const acceptSuggestion = Commands.declare(
     'aws.amazonq.accept',
-    (context: ExtContext) =>
+    (context: vscode.ExtensionContext) =>
         async (
             range: vscode.Range,
             effectiveRange: vscode.Range,
diff --git a/packages/core/src/codewhisperer/index.ts b/packages/core/src/codewhisperer/index.ts
index 1e9e386b03d..ebbd68995e1 100644
--- a/packages/core/src/codewhisperer/index.ts
+++ b/packages/core/src/codewhisperer/index.ts
@@ -62,6 +62,7 @@ export { TelemetryHelper } from './util/telemetryHelper'
 export { LineSelection, LineTracker } from './tracker/lineTracker'
 export { runtimeLanguageContext, RuntimeLanguageContext } from './util/runtimeLanguageContext'
 export * as startSecurityScan from './commands/startSecurityScan'
+export { acceptSuggestion } from './commands/onInlineAcceptance'
 export * from './util/showSsoPrompt'
 export * from './util/securityScanLanguageContext'
 export * from './util/importAdderUtil'