diff --git a/client/src/app.c b/client/src/app.c
index 19a85add..7f3a8792 100644
--- a/client/src/app.c
+++ b/client/src/app.c
@@ -313,6 +313,9 @@ void app_handleKeyPress(int sc)
     if (g_state.escapeActive)
     {
       g_state.escapeAction = sc;
+      KeybindHandle handle = g_state.bindings[sc];
+      if (handle)
+        handle->callback(sc, handle->opaque);
       return;
     }
   }
@@ -358,15 +361,6 @@ void app_handleKeyRelease(int sc)
           !app_isOverlayMode())
         core_setGrab(!g_cursor.grab);
     }
-    else
-    {
-      KeybindHandle handle = g_state.bindings[sc];
-      if (handle)
-      {
-        handle->callback(sc, handle->opaque);
-        return;
-      }
-    }
 
     if (sc == g_params.escapeKey)
       g_state.escapeActive = false;