diff --git a/src/client.c b/src/client.c
index 6b553a2..da23556 100644
--- a/src/client.c
+++ b/src/client.c
@@ -96,7 +96,7 @@ client_get_next(void)
           return NULL;
 
      for(c = sel->next; c && ishide(c, selscreen); c = c->next);
-     if(!c)
+     if(!c && conf.client_round)
           for(c = clients; c && ishide(c, selscreen); c = c->next);
 
      return c;
@@ -117,7 +117,7 @@ client_get_prev(void)
           if(!ishide(d, selscreen))
                c = d;
 
-     if(!c)
+     if(!c && conf.client_round)
           for(; d; d = d->next)
                if(!ishide(d, selscreen))
                     c = d;
diff --git a/src/config.c b/src/config.c
index 5f6873e..94cfab1 100644
--- a/src/config.c
+++ b/src/config.c
@@ -219,6 +219,7 @@ conf_client_section(char *src)
      /* Client misc */
      cfg_set_sauv(src);
 
+     conf.client_round               = get_opt(src, "true", "client_round").bool;
      conf.client.borderheight        = (get_opt(src, "1", "border_height").num < 1 ? 1 : get_opt(src, "1", "border_height").num);
      conf.client.border_shadow       = get_opt(src, "false", "border_shadow").bool;
      conf.client.place_at_mouse      = get_opt(src, "false", "place_at_mouse").bool;
diff --git a/src/structs.h b/src/structs.h
index 7f7f0bc..50ebdcc 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -420,6 +420,7 @@ typedef struct
      Launcher *launcher;
      int *ntag;
      Bool tag_round;
+     Bool client_round;
      Bool layout_system; /* Switch: False, Menu: True. */
      Bool layout_placement; /* Right (normal): False, Left: True. */
      /* Number of... */
diff --git a/wmfsrc.in b/wmfsrc.in
index ae39555..aa9b454 100644
--- a/wmfsrc.in
+++ b/wmfsrc.in
@@ -99,6 +99,7 @@
 [/root]
 
 [client]
+        client_round         = true
         border_height        = 3
         border_shadow        = true
         border_normal        = "#191919"