diff --git a/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/CustomTextPaneKeyAdapter.kt b/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/CustomTextPaneKeyAdapter.kt
index e4fdcbc6..8430c235 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/CustomTextPaneKeyAdapter.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/CustomTextPaneKeyAdapter.kt
@@ -69,10 +69,6 @@ class CustomTextPaneKeyAdapter(
                 )
             )
             return
-        } else if (e.keyChar == '\t') {
-            suggestionsPopupManager.requestFocus()
-            suggestionsPopupManager.selectNext()
-            return
         } else if (popupVisible) {
             updateSuggestions()
         }
@@ -88,6 +84,14 @@ class CustomTextPaneKeyAdapter(
         }
     }
 
+    override fun keyPressed(e: KeyEvent) {
+        if (e.keyChar == '\t') {
+            suggestionsPopupManager.requestFocus()
+            suggestionsPopupManager.selectNext()
+            e.consume()
+        }
+    }
+
     private fun updateSuggestions() {
         CoroutineScope(Dispatchers.Default).launch {
             runInEdt {