diff --git a/.changes/next-release/bugfix-bc45640b-9877-43e5-b6cd-8b7dc35c570b.json b/.changes/next-release/bugfix-bc45640b-9877-43e5-b6cd-8b7dc35c570b.json
new file mode 100644
index 00000000000..3bbf444a946
--- /dev/null
+++ b/.changes/next-release/bugfix-bc45640b-9877-43e5-b6cd-8b7dc35c570b.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix inline chat shortcut hint breaking text selection on remote editors"
+}
\ No newline at end of file
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatSelectionListener.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatSelectionListener.kt
index 106e672486d..270ac2820b7 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatSelectionListener.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatSelectionListener.kt
@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.cwc.inline.listeners
 
+import com.intellij.idea.AppMode
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.editor.event.SelectionEvent
 import com.intellij.openapi.editor.event.SelectionListener
@@ -11,6 +12,7 @@ import software.aws.toolkits.jetbrains.services.cwc.inline.InlineChatEditorHint
 class InlineChatSelectionListener : SelectionListener, Disposable {
     private val inlineChatEditorHint = InlineChatEditorHint()
     override fun selectionChanged(e: SelectionEvent) {
+        if (AppMode.isRemoteDevHost()) return
         val editor = e.editor
         val selectionModel = editor.selectionModel