diff --git a/src/config.c b/src/config.c
index 9472523..36bdee6 100644
--- a/src/config.c
+++ b/src/config.c
@@ -131,6 +131,10 @@ void cfg_save()
     if (!g_config.save_settings)
         return;
 
+    /* Do not save settings while window is maxmized */
+    if (IsMacOS() && !g_config.window_rect.left && !g_config.window_rect.top)
+        return;
+
     char buf[16];
     char* section = g_config.save_settings == 1 ? "ddraw" : g_config.process_file_name;
 
diff --git a/src/wndproc.c b/src/wndproc.c
index ed17114..a2ffa7e 100644
--- a/src/wndproc.c
+++ b/src/wndproc.c
@@ -453,8 +453,6 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 
                     WaitForSingleObject(g_ddraw.render.thread, INFINITE);
                     g_ddraw.render.thread = NULL;
-
-                    g_config.save_settings = 0;
                 }
 
                 if (in_size_move && !g_ddraw.render.thread)