diff --git a/src/renderer/components/battle/BattleChat.vue b/src/renderer/components/battle/BattleChat.vue
index 1639fe72..12f53582 100644
--- a/src/renderer/components/battle/BattleChat.vue
+++ b/src/renderer/components/battle/BattleChat.vue
@@ -50,6 +50,7 @@ function sendMessage() {
     // If an autosuggestion is currently keyboard selected: pressing enter should autocomplete the suggestion
     if (autoSuggestionSelection.value != null) {
         myMessage.value = autoSuggestionSelection.value;
+        return;
     }
 
     api.comms.request("c.lobby.message", {
diff --git a/src/renderer/components/controls/AutoSuggest.vue b/src/renderer/components/controls/AutoSuggest.vue
index 04aa1015..4a16d663 100644
--- a/src/renderer/components/controls/AutoSuggest.vue
+++ b/src/renderer/components/controls/AutoSuggest.vue
@@ -91,7 +91,7 @@ function clickOption(option: AutoSuggestionOption) {
 }
 
 function changeKeyboardSelection(direction: 1 | -1) {
-    if (filteredOptions.value == null) {
+    if (filteredOptions.value == null || filteredOptions.value.length === 0) {
         updateKeyboardSelectionIndex(null);
         return;
     }