diff --git a/openbox/action.c b/openbox/action.c
index 60af74b5..431b88c1 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -40,9 +40,6 @@
 
 inline void client_action_start(union ActionData *data)
 {
-    if (config_focus_follow)
-        if (data->any.context != OB_FRAME_CONTEXT_CLIENT && !data->any.button)
-            grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
 }
 
 inline void client_action_end(union ActionData *data)
@@ -50,7 +47,7 @@ inline void client_action_end(union ActionData *data)
     if (config_focus_follow)
         if (data->any.context != OB_FRAME_CONTEXT_CLIENT) {
             if (!data->any.button) {
-                ungrab_pointer();
+                event_ignore_queued_enters();
             } else {
                 ObClient *c;