diff --git a/frame.c b/frame.c
index 0e187260..d2fb30df 100644
--- a/frame.c
+++ b/frame.c
@@ -239,13 +239,14 @@ draw_frame(Frame *f) {
 	br.border = 1;
 	br.rect.width += br.rect.x;
 	br.rect.x = 0;
-	f->titlebar.x = br.rect.x + 1;
-	f->titlebar.height = br.rect.height - 1;
-	f->titlebar.y = br.rect.y + 1;
-	f->titlebar.width = br.rect.width - 2;
+	f->titlebar.x = br.rect.x + 3;
+	f->titlebar.height = br.rect.height - 3;
+	f->titlebar.y = br.rect.y + 3;
+	f->titlebar.width = br.rect.width - 6;
 	draw_border(&br);
 	br.rect.height = f->rect.height;
-	draw_border(&br);
+	if(def.border)
+		draw_border(&br);
 
 	if(f->client->urgent)
 		br.color.bg = br.color.fg;
diff --git a/rc/rc.wmii b/rc/rc.wmii
index 88170b24..8d656054 100755
--- a/rc/rc.wmii
+++ b/rc/rc.wmii
@@ -167,6 +167,7 @@ fn Key-$MODKEY-Shift-c {
 }
 fn Key-$MODKEY-Shift-t {
 	wmiir xwrite /client/`{wmiir read /client/sel/ctl}^/tags `{read_tags | wmiimenu} &
+}
 
 for(i in `{seq 0 9}) {
 	fn Key-$MODKEY-$i {