diff --git a/src/client.c b/src/client.c
index 4506b26..bd24be5 100644
--- a/src/client.c
+++ b/src/client.c
@@ -356,6 +356,7 @@ client_focus(Client *c)
                sel->flags &= ~AboveFlag;
 
           frame_update(sel);
+
           mouse_grabbuttons(sel, !conf.focus_pclick);
      }
 
diff --git a/src/layout.c b/src/layout.c
index 4bf98e0..93e08d3 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -39,7 +39,7 @@ arrange(int screen, Bool update_layout)
 {
      Client *c;
 
-     if(screen < 0 || screen > screen_count())
+     if(screen < 0 || screen > screen_count() - 1)
           screen = screen_get_sel();
 
      for(c = clients; c; c = c->next)