diff --git a/src/dispatch/bind_define.h b/src/dispatch/bind_define.h
index bdcd921..c814c5b 100644
--- a/src/dispatch/bind_define.h
+++ b/src/dispatch/bind_define.h
@@ -1015,6 +1015,8 @@ void togglemaxmizescreen(const Arg *arg) {
 		setmaxmizescreen(sel, 0);
 	else
 		setmaxmizescreen(sel, 1);
+
+	setborder_color(sel);
 }
 void toggleoverlay(const Arg *arg) {
 	if (!selmon->sel || !selmon->sel->mon || selmon->sel->isfullscreen) {
diff --git a/src/mango.c b/src/mango.c
index ffe9879..8f069ba 100644
--- a/src/mango.c
+++ b/src/mango.c
@@ -3981,10 +3981,6 @@ void setmaxmizescreen(Client *c, int maxmizescreen) {
 
 	c->ismaxmizescreen = maxmizescreen;
 
-	wlr_scene_node_reparent(&c->scene->node, layers[maxmizescreen	? LyrTile
-													: c->isfloating ? LyrFloat
-																	: LyrTile]);
-
 	if (maxmizescreen) {
 
 		if (c->isfullscreen)
@@ -4011,6 +4007,10 @@ void setmaxmizescreen(Client *c, int maxmizescreen) {
 			setfloating(c, 1);
 		arrange(c->mon, false);
 	}
+
+	wlr_scene_node_reparent(&c->scene->node, layers[maxmizescreen	? LyrTile
+													: c->isfloating ? LyrFloat
+																	: LyrTile]);
 }
 
 void setfakefullscreen(Client *c, int fakefullscreen) {
@@ -4032,17 +4032,6 @@ void setfullscreen(Client *c, int fullscreen) // 用自定义全屏代理自带
 
 	client_set_fullscreen(c, fullscreen);
 
-	if (c->isoverlay) {
-		wlr_scene_node_reparent(&c->scene->node, layers[LyrOverlay]);
-	} else if (client_should_overtop(c) && c->isfloating) {
-		wlr_scene_node_reparent(&c->scene->node, layers[LyrFSorOverTop]);
-	} else {
-		wlr_scene_node_reparent(&c->scene->node,
-								layers[fullscreen	   ? LyrFSorOverTop
-									   : c->isfloating ? LyrFloat
-													   : LyrTile]);
-	}
-
 	if (fullscreen) {
 		if (c->ismaxmizescreen)
 			setmaxmizescreen(c, 0);
@@ -4067,6 +4056,17 @@ void setfullscreen(Client *c, int fullscreen) // 用自定义全屏代理自带
 			setfloating(c, 1);
 		arrange(c->mon, false);
 	}
+
+	if (c->isoverlay) {
+		wlr_scene_node_reparent(&c->scene->node, layers[LyrOverlay]);
+	} else if (client_should_overtop(c) && c->isfloating) {
+		wlr_scene_node_reparent(&c->scene->node, layers[LyrFSorOverTop]);
+	} else {
+		wlr_scene_node_reparent(&c->scene->node,
+								layers[fullscreen	   ? LyrFSorOverTop
+									   : c->isfloating ? LyrFloat
+													   : LyrTile]);
+	}
 }
 
 void setgaps(int oh, int ov, int ih, int iv) {