diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp
index 345c76bdfab..40ec93b6124 100644
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/util_system.cpp
@@ -116,7 +116,8 @@ int system_cpu_bits()
 	return (sizeof(void*)*8);
 }
 
-#if defined(__x86_64__) || defined(_M_X64) || defined(i386) || defined(_M_IX86)
+/* SSE optimization disabled for now on 32 bit GCC, see bug #36316 */
+#if defined(__x86_64__) || defined(_M_X64) || ((defined(i386) || defined(_M_IX86)) && !defined(__GNUC__))
 
 struct CPUCapabilities {
 	bool x64;
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 9cea4210769..770cfca6968 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -1025,6 +1025,8 @@ GHOST_TSuccess GHOST_SystemCocoa::handleWindowEvent(GHOST_TEventType eventType,
 	}
 		switch (eventType) {
 			case GHOST_kEventWindowClose:
+				// make window that should be closed frontmost
+				[window->getCocoaWindow() makeKeyAndOrderFront:nil];
 				// check for index of mainwindow as it would quit blender without dialog and discard
 				if (window->getCocoaWindow() != [windowsList objectAtIndex:([windowsList count] - 1)]) {
 					pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowClose, window) );