diff --git a/client.c b/client.c
index a105514..cd16e11 100644
--- a/client.c
+++ b/client.c
@@ -229,6 +229,7 @@ manage(Window w, XWindowAttributes *wa) {
 	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
 	ban(c);
 	XMapWindow(dpy, c->win);
+	setclientstate(c, NormalState);
 	arrange();
 }
 
diff --git a/config.mk b/config.mk
index 320aea1..f9b5f7f 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 4.4
+VERSION = 4.4.1
 
 # Customize below to fit your system
 
diff --git a/dwm.1 b/dwm.1
index 885405a..cf197f5 100644
--- a/dwm.1
+++ b/dwm.1
@@ -97,7 +97,7 @@ Close focused window.
 Toggle between tiled and floating layout (affects all windows).
 .TP
 .B Mod1\-Shift\-space
-Toggle focused window between tiled and floating state (tiled layout only).
+Toggle focused window between tiled and floating state.
 .TP
 .B Mod1\-[1..n]
 View all windows with
diff --git a/screen.c b/screen.c
index 8d04911..255184a 100644
--- a/screen.c
+++ b/screen.c
@@ -284,7 +284,7 @@ togglebar(const char *arg) {
 
 void
 togglefloating(const char *arg) {
-	if(!sel || isfloating())
+	if(!sel)
 		return;
 	sel->isfloating = !sel->isfloating;
 	if(sel->isfloating)
diff --git a/tile.c b/tile.c
index 114e84c..7915441 100644
--- a/tile.c
+++ b/tile.c
@@ -46,7 +46,7 @@ tile(void) {
 
 	nx = wax;
 	ny = way;
-	for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) {
+	for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++) {
 		c->ismax = False;
 		if(i == 0) { /* master */
 			nw = mw - 2 * c->border;
@@ -66,7 +66,6 @@ tile(void) {
 		resize(c, nx, ny, nw, nh, False);
 		if(n > 1 && th != wah)
 			ny += nh + 2 * c->border;
-		i++;
 	}
 }