diff --git a/client/src/main.c b/client/src/main.c
index 542156d9..f05e9297 100644
--- a/client/src/main.c
+++ b/client/src/main.c
@@ -1563,7 +1563,7 @@ static void setGrabQuiet(bool enable)
   {
     if (params.grabKeyboard)
     {
-      if (!g_state.focused || params.captureInputOnly)
+      if (!params.grabKeyboardOnFocus || !g_state.focused || params.captureInputOnly)
         g_state.ds->ungrabKeyboard();
     }