diff --git a/src/video/quartz/SDL_QuartzVideo.m b/src/video/quartz/SDL_QuartzVideo.m
index 570191477..fa04e9d10 100644
--- a/src/video/quartz/SDL_QuartzVideo.m
+++ b/src/video/quartz/SDL_QuartzVideo.m
@@ -840,7 +840,7 @@ static SDL_Surface* QZ_SetVideoFullScreen (_THIS, SDL_Surface *current, int widt
         if ( isLion ) {
             [ qz_window setLevel:CGShieldingWindowLevel() ];
             [ gl_context setView: window_view ];
-            [ gl_context setFullScreen ];
+            //[ gl_context setFullScreen ];
             [ gl_context update ];
         }
 
@@ -903,6 +903,7 @@ static SDL_Surface* QZ_SetVideoFullScreen (_THIS, SDL_Surface *current, int widt
     if (isLion) {
         [ qz_window setHasShadow:NO];
         [ qz_window setOpaque:YES];
+        [ qz_window makeKeyAndOrderFront:nil ];
     }
 
     /* !!! FIXME: keep an eye on this.