diff --git a/dwm.c b/dwm.c
index ccb9350..495b101 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1583,8 +1583,8 @@ setfullscreen(Client *c, int fullscreen)
 			PropModeReplace, (unsigned char*)0, 0);
 		c->isfullscreen = 0;
 		c->isfloating = c->oldstate;
+		c->bw = c->oldbw;
 		if(c->isfloating){
-			c->bw = c->oldbw;
 			c->x = c->oldx;
 			c->y = c->oldy;
 			c->w = c->oldw;