diff --git a/src/servers/app/ServerPicture.cpp b/src/servers/app/ServerPicture.cpp
index 7c73a6bfbe..55796ed093 100644
--- a/src/servers/app/ServerPicture.cpp
+++ b/src/servers/app/ServerPicture.cpp
@@ -449,8 +449,10 @@ draw_picture(View *view, BPoint where, int32 token)
 {
 	ServerPicture *picture = view->Window()->ServerWindow()->App()->FindPicture(token);	
 	if (picture != NULL) {
-		view->CurrentState()->SetOrigin(where);
+		view->SetDrawingOrigin(where);
+		view->PushState();	
 		picture->Play(view);
+		view->PopState();
 	}
 }