diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 62bd5a909..097150510 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -1784,16 +1784,17 @@ resetCursorRectsForView(NSView *theView)
 
 - (void) _processResizeEvent
 {
-  NSGraphicsContext* context = GSCurrentContext();
 
   if (gstate)
     {
+      NSGraphicsContext* context = GSCurrentContext();
       DPSgsave(context);
       DPSsetgstate(context, gstate);
+      DPSupdatewindow(context, window_num);
+      DPScurrentgstate(context, gstate);
+      DPSpop(context);
+      DPSgrestore(context);
     }
-  DPSupdatewindow(context, window_num);
-  if (gstate)
-    DPSgrestore(context);
 
   [self update];
 }