diff --git a/src/maomao.c b/src/maomao.c
index a1f2228..b74b716 100644
--- a/src/maomao.c
+++ b/src/maomao.c
@@ -5981,17 +5981,14 @@ void togglefullscreen(const Arg *arg) {
 	if (!sel)
 		return;
 
-	// if(sel->isfloating)
-	// 	setfloating(sel, 0);
+	sel->is_scratchpad_show = 0;
+	sel->is_in_scratchpad = 0;
+	sel->isnamedscratchpad = 0;
 
 	if (sel->isfullscreen || sel->ismaxmizescreen)
 		setfullscreen(sel, 0);
 	else
 		setfullscreen(sel, 1);
-
-	sel->is_scratchpad_show = 0;
-	sel->is_in_scratchpad = 0;
-	sel->isnamedscratchpad = 0;
 }
 
 void togglemaxmizescreen(const Arg *arg) {
@@ -5999,17 +5996,14 @@ void togglemaxmizescreen(const Arg *arg) {
 	if (!sel)
 		return;
 
-	// if(sel->isfloating)
-	// 	setfloating(sel, 0);
+	sel->is_scratchpad_show = 0;
+	sel->is_in_scratchpad = 0;
+	sel->isnamedscratchpad = 0;
 
 	if (sel->isfullscreen || sel->ismaxmizescreen)
 		setmaxmizescreen(sel, 0);
 	else
 		setmaxmizescreen(sel, 1);
-
-	sel->is_scratchpad_show = 0;
-	sel->is_in_scratchpad = 0;
-	sel->isnamedscratchpad = 0;
 }
 
 void togglegaps(const Arg *arg) {