diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c
index 67c1479f..0ef9d268 100644
--- a/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@ -55,7 +55,9 @@ static gboolean run_func(ObActionsData *data, gpointer options)
             (data->context != OB_FRAME_CONTEXT_CLIENT &&
              data->context != OB_FRAME_CONTEXT_FRAME))
         {
+            actions_client_move(data, TRUE);
             client_activate(data->client, o->here, FALSE, FALSE, TRUE);
+            actions_client_move(data, FALSE);
         }
     } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) {
         /* focus action on the root window. make keybindings work for this