diff --git a/.changes/next-release/feature-e9ce3eeb-09a5-4418-ab15-91185f560532.json b/.changes/next-release/feature-e9ce3eeb-09a5-4418-ab15-91185f560532.json
new file mode 100644
index 00000000000..bada20d3863
--- /dev/null
+++ b/.changes/next-release/feature-e9ce3eeb-09a5-4418-ab15-91185f560532.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add model selection feature"
+}
\ No newline at end of file
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
index fc88293038e..6f785067db9 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
@@ -148,6 +148,7 @@ class Browser(parent: Disposable, private val webUri: URI, val project: Project)
                         {
                         agenticMode: true,
                         quickActionCommands: [],
+                        modelSelectionEnabled: true,
                         disclaimerAcknowledged: ${MeetQSettings.getInstance().disclaimerAcknowledged},
                         pairProgrammingAcknowledged: ${MeetQSettings.getInstance().pairProgrammingAcknowledged}
                         },
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/handler.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/handler.ts
index c18746be1d8..4734b37d7b9 100644
--- a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/handler.ts
+++ b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/handler.ts
@@ -394,6 +394,8 @@ private handleDocCommand(chatPrompt: ChatPrompt, tabID: string, taskName: string
                 loadingChat: true,
                 cancelButtonWhenLoading: false,
             })
+        } else {
+            this.mynahUI?.updateStore(affectedTabId, { promptInputOptions: [] })
         }
 
         if (affectedTabId && this.isHybridChatEnabled) {