diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index a97f7621bb0..83f86840eb4 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -783,9 +783,9 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
 			break;
 		case GHOST_kWindowStateNormal:
         default:
+			NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 			if (m_fullScreen)
 			{
-				NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 				m_fullScreen = false;
 
 				//Exit fullscreen
@@ -835,15 +835,15 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
 			
 				//Tell WM of view new size
 				m_systemCocoa->handleWindowEvent(GHOST_kEventWindowSize, this);
-				
-				[pool drain];
 			}
             else if ([m_window isMiniaturized])
 				[m_window deminiaturize:nil];
 			else if ([m_window isZoomed])
 				[m_window zoom:nil];
+			[pool drain];
             break;
     }
+
     return GHOST_kSuccess;
 }