Index: intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- intern/ghost/intern/GHOST_WindowCocoa.mm	(revision 38609)
+++ intern/ghost/intern/GHOST_WindowCocoa.mm	(working copy)
@@ -58,7 +58,7 @@
 	extern void wm_draw_update(bContext *C);
 };*/
 @interface CocoaWindowDelegate : NSObject
-#ifdef MAC_OS_X_VERSION_10_6
+#if defined(MAC_OS_X_VERSION_10_6) || defined(MAC_OS_X_VERSION_10_7)
 <NSWindowDelegate>
 #endif
 {
@@ -465,6 +465,15 @@
 										  
 	if (state == GHOST_kWindowStateFullScreen)
 		setState(GHOST_kWindowStateFullScreen);
+    
+    /* FULL SCREEN OSX 10.7 */
+    if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6) {
+        NSWindowCollectionBehavior wcBehavior = [m_window collectionBehavior];
+        wcBehavior |= NSWindowCollectionBehaviorFullScreenPrimary;
+        [m_window setCollectionBehavior:wcBehavior];
+    }
+    /* /END FULLSCREEN */
+
 		
 	[pool drain];
 }