diff --git a/src/config.c b/src/config.c
index 2f713c8..dc53cc2 100644
--- a/src/config.c
+++ b/src/config.c
@@ -213,7 +213,7 @@ conf_client_section(char *src)
      /* Client misc */
      cfg_set_sauv(src);
 
-     conf.client.borderheight        = (get_opt(src, "1", "border_height").num);
+     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;
      conf.client.bordernormal        = getcolor(get_opt(src, "#000000", "border_normal").str);
diff --git a/src/wmfs.h b/src/wmfs.h
index 10a7937..8311017 100644
--- a/src/wmfs.h
+++ b/src/wmfs.h
@@ -86,7 +86,7 @@
 #define SHADC        (0x000000) /* 'Cause i don't know how darken a color yet */
 #define BORDH        conf.client.borderheight
 #define TBARH        ((conf.titlebar.height < BORDH) ? BORDH : conf.titlebar.height)
-#define RESHW        (6 * (BORDH + 1))
+#define RESHW        (6 * (BORDH))
 #define BUTTONWH     (TBARH / 2)
 #define DEF_CONF     ".config/wmfs/wmfsrc"
 #define DEF_STATUS   ".config/wmfs/status.sh"