diff --git a/mmsg/mmsg.c b/mmsg/mmsg.c
index 83b116da..0191a635 100644
--- a/mmsg/mmsg.c
+++ b/mmsg/mmsg.c
@@ -569,8 +569,8 @@ int32_t main(int32_t argc, char *argv[]) {
 		mode = WATCH;
 		break;
 	case 'o':
-        if (mode == GET || mode == WATCH)
-            oflag = 1;
+		if (mode == GET || mode == WATCH)
+			oflag = 1;
 		else if (mode == SET)
 			output_name = EARGF(usage());
 		else
diff --git a/src/mango.c b/src/mango.c
index a9a0316c..63a289d2 100644
--- a/src/mango.c
+++ b/src/mango.c
@@ -5240,11 +5240,12 @@ void setfullscreen(Client *c, int32_t fullscreen) // 用自定义全屏代理自
 
 	if (fullscreen) {
 
-		if (c->ismaximizescreen) {
+		if (c->ismaximizescreen && !c->force_maximize) {
 			client_set_maximized(c, false);
-			c->ismaximizescreen = 0;
 		}
 
+		c->ismaximizescreen = 0;
+
 		exit_scroller_stack(c);
 		c->isfakefullscreen = 0;