diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm
index 8aa13991608b..b63cca58a439 100644
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -2569,23 +2569,17 @@ NSEvent* gLastDragMouseDownEvent = nil;
 #endif
 
   LayerManager *layerManager = mGeckoChild->GetLayerManager(nsnull);
-  if (layerManager->GetBackendType() == LayerManager::LAYERS_OPENGL ||
-      (layerManager->AsShadowManager() &&
-             layerManager->GetUserData(&compositor::sShadowNativeContext))) {
+  if (layerManager->GetBackendType() == LayerManager::LAYERS_OPENGL) {
     NSOpenGLContext *glContext;
-    if (layerManager->GetBackendType() == LayerManager::LAYERS_OPENGL) {
-      LayerManagerOGL *manager = static_cast<LayerManagerOGL*>(layerManager);
-      manager->SetClippingRegion(paintEvent.region);
-      glContext = (NSOpenGLContext *)manager->gl()->GetNativeData(mozilla::gl::GLContext::NativeGLContext);
-    } else {
-      ShadowNativeContextUserData *userData =
-        (ShadowNativeContextUserData*)layerManager->GetUserData(&compositor::sShadowNativeContext);
-      glContext = (NSOpenGLContext*)userData->GetNativeContext();
-    }
+
+    LayerManagerOGL *manager = static_cast<LayerManagerOGL*>(layerManager);
+    manager->SetClippingRegion(paintEvent.region);
+    glContext = (NSOpenGLContext *)manager->gl()->GetNativeData(mozilla::gl::GLContext::NativeGLContext);
 
     if (!mGLContext) {
       [self setGLContext:glContext];
     }
+
     mGeckoChild->DispatchWindowEvent(paintEvent);
 
     // Force OpenGL to refresh the very first time we draw. This works around a
@@ -2596,6 +2590,17 @@ NSEvent* gLastDragMouseDownEvent = nil;
     }
 
     return;
+  } else if (layerManager->AsShadowManager() &&
+             layerManager->GetUserData(&compositor::sShadowNativeContext)) {
+    NSOpenGLContext *glContext;
+
+    ShadowNativeContextUserData *userData =
+        (ShadowNativeContextUserData*)layerManager->GetUserData(&compositor::sShadowNativeContext);
+      glContext = (NSOpenGLContext*)userData->GetNativeContext();
+
+    if (!mGLContext) {
+      [self setGLContext:glContext];
+    }
   }
 
   // Create Cairo objects.
@@ -2625,6 +2630,17 @@ NSEvent* gLastDragMouseDownEvent = nil;
     painted = mGeckoChild->DispatchWindowEvent(paintEvent);
   }
 
+  // Force OpenGL to refresh the very first time we draw. This works around a
+  // Mac OS X bug that stops windows updating on OS X when we use OpenGL.
+  if (painted && !mDidForceRefreshOpenGL &&
+      layerManager->AsShadowManager() &&
+      layerManager->GetUserData(&compositor::sShadowNativeContext)) {
+    if (!mDidForceRefreshOpenGL) {
+      [self performSelector:@selector(forceRefreshOpenGL) withObject:nil afterDelay:0];
+      mDidForceRefreshOpenGL = YES;
+    }
+  }
+
   if (!painted && [self isOpaque]) {
     // Gecko refused to draw, but we've claimed to be opaque, so we have to
     // draw something--fill with white.