diff --git a/packages/amazonq/.changes/next-release/Feature-7f17c8e5-2242-4a8a-93bc-f7a6c08899dc.json b/packages/amazonq/.changes/next-release/Feature-7f17c8e5-2242-4a8a-93bc-f7a6c08899dc.json
new file mode 100644
index 00000000000..5afafc86aef
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Feature-7f17c8e5-2242-4a8a-93bc-f7a6c08899dc.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q: increase chat current active file context char limit to 40k"
+}
diff --git a/packages/core/src/codewhispererChat/editor/context/focusArea/focusAreaExtractor.ts b/packages/core/src/codewhispererChat/editor/context/focusArea/focusAreaExtractor.ts
index d2b80f2619f..d782f7147ff 100644
--- a/packages/core/src/codewhispererChat/editor/context/focusArea/focusAreaExtractor.ts
+++ b/packages/core/src/codewhispererChat/editor/context/focusArea/focusAreaExtractor.ts
@@ -7,7 +7,7 @@ import { TextEditor, Selection, TextDocument, Range } from 'vscode'
 
 import { FocusAreaContext, FullyQualifiedName } from './model'
 
-const focusAreaCharLimit = 9_000
+const focusAreaCharLimit = 40_000
 
 export class FocusAreaContextExtractor {
     public isCodeBlockSelected(editor: TextEditor): boolean {