diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp
index 49c9360d79..639c813c03 100644
--- a/src/servers/app/ServerWindow.cpp
+++ b/src/servers/app/ServerWindow.cpp
@@ -1821,6 +1821,7 @@ fDesktop->LockSingleWindow();
 				// of the previous state
 				fCurrentLayer->SetUserClipping(NULL);
 			}
+			fCurrentDrawingRegionValid = false;
 
 			break;
 		}
diff --git a/src/servers/app/ViewLayer.cpp b/src/servers/app/ViewLayer.cpp
index 00ff62b90a..0bf3f62034 100644
--- a/src/servers/app/ViewLayer.cpp
+++ b/src/servers/app/ViewLayer.cpp
@@ -1182,7 +1182,7 @@ ViewLayer::PopState()
 		return;
 	}
 
-	bool rebuildClipping = fDrawState->ClippingRegion() != NULL;
+	bool rebuildClipping = true; //fDrawState->ClippingRegion() != NULL;
 
 	fDrawState = fDrawState->PopState();
 	fDrawState->SetSubPixelPrecise(fFlags & B_SUBPIXEL_PRECISE);