diff --git a/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/suggestion/SuggestionsPopupManager.kt b/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/suggestion/SuggestionsPopupManager.kt
index 3800905a..e0feba8e 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/suggestion/SuggestionsPopupManager.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/suggestion/SuggestionsPopupManager.kt
@@ -63,13 +63,13 @@ class SuggestionsPopupManager(
     }
 
     fun selectNext() {
-        list.requestFocus()
         list.selectNext()
+        list.requestFocus()
     }
 
     fun selectPrevious() {
-        list.requestFocus()
         list.selectPrevious()
+        list.requestFocus()
     }
 
     fun updateSuggestions(searchText: String? = null) {
@@ -83,7 +83,6 @@ class SuggestionsPopupManager(
                 listModel.addAll(suggestions)
                 list.revalidate()
                 list.repaint()
-                selectNext()
             }
         }
     }