diff --git a/patch/fakefullscreenclient.c b/patch/fakefullscreenclient.c
index 5b3d7af..2b4b279 100644
--- a/patch/fakefullscreenclient.c
+++ b/patch/fakefullscreenclient.c
@@ -10,6 +10,15 @@ togglefakefullscreen(const Arg *arg)
         else
             selmon->sel->isfullscreen = 0;
     } else {
+        if (selmon->sel->isfullscreen) {
+            selmon->sel->isfloating = selmon->sel->oldstate;
+            selmon->sel->bw = selmon->sel->oldbw;
+            selmon->sel->x = selmon->sel->oldx;
+            selmon->sel->y = selmon->sel->oldy;
+            selmon->sel->w = selmon->sel->oldw;
+            selmon->sel->h = selmon->sel->oldh;
+            resizeclient(selmon->sel, selmon->sel->x, selmon->sel->y, selmon->sel->w, selmon->sel->h);
+        }
         selmon->sel->fakefullscreen = 1;
         selmon->sel->isfullscreen = 0;
     }