diff --git a/.gitignore b/.gitignore
index ede5d7139..3a11022f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-extensions
\ No newline at end of file
+extensions
+datafiles/themes/default
diff --git a/scripts/mac_window_init/mac_window_init.gml b/scripts/mac_window_init/mac_window_init.gml
index 743539d0d..e3f43b191 100644
--- a/scripts/mac_window_init/mac_window_init.gml
+++ b/scripts/mac_window_init/mac_window_init.gml
@@ -9,6 +9,7 @@ enum WINDOW_DRAG_MODE {
 function mac_window_init() {
 	globalvar __win_is_maximized, __win_min_x, __win_min_y, __win_min_w, __win_min_h;
 	
+	__win_delay = 2;
 	__win_is_dragging = 0;
 	__win_drag_mx = 0;
 	__win_drag_my = 0;
diff --git a/scripts/mac_window_step/mac_window_step.gml b/scripts/mac_window_step/mac_window_step.gml
index 3dd5b2b9f..ea7a39950 100644
--- a/scripts/mac_window_step/mac_window_step.gml
+++ b/scripts/mac_window_step/mac_window_step.gml
@@ -1,4 +1,6 @@
 function mac_window_step() {
+	if(--__win_delay) return;
+	
 	var _mx = mouse_raw_x;
 	var _my = mouse_raw_y;
 	
diff --git a/scripts/preferences/preferences.gml b/scripts/preferences/preferences.gml
index 7a4f0edfe..86d5567ab 100644
--- a/scripts/preferences/preferences.gml
+++ b/scripts/preferences/preferences.gml
@@ -251,7 +251,7 @@
 				setException();
 		}
 		
-		if(!LOADING) {
+		if(OS != os_macosx && !LOADING) {
 			if(PREF_MAP[? "window_maximize"]) {
 				gameframe_maximize();
 			} else {