diff --git a/client/src/app.c b/client/src/app.c
index 2849e5b1..f1d534ce 100644
--- a/client/src/app.c
+++ b/client/src/app.c
@@ -288,6 +288,13 @@ void app_handleKeyPress(int sc)
     return;
   }
 
+  if (g_state.overlayInput)
+  {
+    g_state.io->KeysDown[sc] = true;
+    if (g_state.io->WantCaptureKeyboard)
+      return;
+  }
+
   if (!core_inputEnabled())
     return;
 
@@ -336,6 +343,13 @@ void app_handleKeyRelease(int sc)
   if (!core_inputEnabled())
     return;
 
+  if (g_state.overlayInput)
+  {
+    g_state.io->KeysDown[sc] = false;
+    if (g_state.io->WantCaptureKeyboard)
+      return;
+  }
+
   // avoid sending key up events when we didn't send a down
   if (!g_state.keyDown[sc])
     return;