diff --git a/area.c b/area.c
index ecff17d9..ade470e9 100644
--- a/area.c
+++ b/area.c
@@ -155,9 +155,9 @@ attach_to_area(Area *a, Frame *f, Bool send) {
 	else /* floating */
 		place_client(a, c);
 
+	focus_client(f->client, False);
 	if(!a->floating)
 		arrange_column(a, False);
-	focus_client(f->client, False);
 
 	update_client_grab(f->client);
 }
diff --git a/mouse.c b/mouse.c
index 4ea39121..c879d088 100644
--- a/mouse.c
+++ b/mouse.c
@@ -266,7 +266,7 @@ do_managed_move(Client *c) {
 	int x, y, i;
 
 	focus(c, False);
-	f = c->frame;
+	f = c->sel;
 
 	XSync(blz.dpy, False);
 	if(XGrabPointer(blz.dpy, c->framewin, False, MouseMask, GrabModeAsync, GrabModeAsync,