1 files changed, 13 insertions, 0 deletions
diff --git a/Source/Core/VideoCommon/NetPlayChatUI.cpp b/Source/Core/VideoCommon/NetPlayChatUI.cpp
index 2388d94b91..7587229ee0 100644
--- a/Source/Core/VideoCommon/NetPlayChatUI.cpp
+++ b/Source/Core/VideoCommon/NetPlayChatUI.cpp
@@ -60,7 +60,12 @@ void NetPlayChatUI::Display()
                        ImGuiInputTextFlags_EnterReturnsTrue))
   {
     SendMessage();
+  }
+
+  if (m_activate)
+  {
     ImGui::SetKeyboardFocusHere(-1);
+    m_activate = false;
   }
 
   ImGui::PopItemWidth();
@@ -97,3 +102,11 @@ void NetPlayChatUI::SendMessage()
     m_message_buf[0] = '\0';
   }
 }
+
+void NetPlayChatUI::Activate()
+{
+  if (ImGui::IsItemFocused())
+    ImGui::SetWindowFocus(NULL);
+  else
+    m_activate = true;
+}