diff --git a/src/servers/app/ServerPicture.cpp b/src/servers/app/ServerPicture.cpp
index fc2fafb1ca..51d1acd2ef 100644
--- a/src/servers/app/ServerPicture.cpp
+++ b/src/servers/app/ServerPicture.cpp
@@ -467,8 +467,8 @@ pop_state(ViewLayer *view)
 {
 	view->PopState();
 
-	IntPoint p = view->ScrollingOffset();
-	p += IntPoint(view->CurrentState()->Origin());
+	BPoint p(0, 0);
+	view->ConvertToScreenForDrawing(&p);
 	view->Window()->GetDrawingEngine()->SetDrawState(
 		view->CurrentState(), p.x, p.y);
 }
diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp
index 52a99d5d05..794e23b270 100644
--- a/src/servers/app/ServerWindow.cpp
+++ b/src/servers/app/ServerWindow.cpp
@@ -3179,8 +3179,8 @@ ServerWindow::_UpdateDrawState(ViewLayer* layer)
 	// "offsets" passed below would need to be updated again
 	DrawingEngine* drawingEngine = fWindowLayer->GetDrawingEngine();
 	if (layer && drawingEngine) {
-		IntPoint p = layer->ScrollingOffset();
-		p += IntPoint(layer->CurrentState()->Origin());
+		BPoint p(0, 0);
+		layer->ConvertToScreenForDrawing(&p);
 		drawingEngine->SetDrawState(layer->CurrentState(), p.x, p.y);
 	}
 }