--- a/hw/xquartz/quartzRandR.c
+++ b/hw/xquartz/quartzRandR.c
@@ -346,7 +346,23 @@ static int QuartzRandRRegisterModeCallback (ScreenPtr pScreen,
 static Bool QuartzRandRSetMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode, BOOL doRegister) {
     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);
     CGDirectDisplayID screenId = pQuartzScreen->displayIDs[0];
+    Bool doCaptureDisplay = FALSE;
+    Bool doReleaseDisplay = FALSE;
+
+    if(pQuartzScreen->currentMode.refresh == FAKE_REFRESH_ROOTLESS || pQuartzScreen->currentMode.refresh == FAKE_REFRESH_FULLSCREEN)
+        doCaptureDisplay = TRUE;
+    if(pMode->refresh == FAKE_REFRESH_ROOTLESS || pMode->refresh == FAKE_REFRESH_FULLSCREEN)
+        doReleaseDisplay = TRUE;
+    if(doCaptureDisplay && doReleaseDisplay) {
+        doCaptureDisplay = FALSE;
+        doReleaseDisplay = FALSE;        
+    }
 
+    if(doCaptureDisplay) {
+        CGCaptureAllDisplays();
+        DEBUG_LOG("Display captured.  ShieldWindowID: %u, Shield level: %d\n", CGShieldingWindowID(screenId), CGShieldingWindowLevel()); // 2147483630
+    }
+    
     if (pQuartzScreen->currentMode.ref && CFEqual(pMode->ref, pQuartzScreen->currentMode.ref)) {
         DEBUG_LOG("Requested RandR resolution matches current CG mode\n");
     } if (QuartzRandRSetCGMode(screenId, pMode)) {
@@ -369,6 +385,9 @@ static Bool QuartzRandRSetMode(ScreenPtr pScreen, QuartzModeInfoPtr pMode, BOOL
     pQuartzScreen->currentMode = *pMode;
     CFRetain(pQuartzScreen->currentMode.ref);
     
+    if(doReleaseDisplay)
+        CGReleaseAllDisplays();
+
     return TRUE;
 }
 
