From 741e9b8cb0aee586edff7cc32c2534c7d4f2a324 Mon Sep 17 00:00:00 2001
From: Kelsi <kelsihates2fa@gmail.com>
Date: Sat, 14 Feb 2026 22:00:26 -0800
Subject: [PATCH] Close chat input after sending

---
 src/ui/game_screen.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ui/game_screen.cpp b/src/ui/game_screen.cpp
index b52c8abd..48c18614 100644
--- a/src/ui/game_screen.cpp
+++ b/src/ui/game_screen.cpp
@@ -27,6 +27,7 @@
 #include "game/expansion_profile.hpp"
 #include "core/logger.hpp"
 #include <imgui.h>
+#include <imgui_internal.h>
 #include <algorithm>
 #include <cmath>
 #include <cstring>
@@ -1061,7 +1062,9 @@ void GameScreen::renderChatWindow(game::GameHandler& gameHandler) {
     ImGuiInputTextFlags inputFlags = ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_CallbackAlways;
     if (ImGui::InputText("##ChatInput", chatInputBuffer, sizeof(chatInputBuffer), inputFlags, inputCallback, this)) {
         sendChatMessage(gameHandler);
-        refocusChatInput = true;
+        // Close chat input on send so movement keys work immediately.
+        refocusChatInput = false;
+        ImGui::ClearActiveID();
     }
     ImGui::PopStyleColor();