diff --git a/src/main/java/games/rednblack/editor/live/LivePreviewScreen.java b/src/main/java/games/rednblack/editor/live/LivePreviewScreen.java
index 79f2f050..1e456747 100644
--- a/src/main/java/games/rednblack/editor/live/LivePreviewScreen.java
+++ b/src/main/java/games/rednblack/editor/live/LivePreviewScreen.java
@@ -22,8 +22,8 @@ import games.rednblack.h2d.extention.spine.SpineItemType;
 import org.puremvc.java.interfaces.IFacade;
 
 public class LivePreviewScreen extends ScreenAdapter implements GestureDetector.GestureListener {
-    private static final Vector3 vec3Zero = new Vector3(0, 0, 0);
-    private static final Vector3 cameraTargetPos = new Vector3();
+    private final Vector3 vec3Zero = new Vector3(0, 0, 0);
+    private final Vector3 cameraTargetPos = new Vector3();
 
     private Viewport viewport;
     private SceneLoader sceneLoader;
@@ -123,7 +123,7 @@ public class LivePreviewScreen extends ScreenAdapter implements GestureDetector.
     public boolean pan(float x, float y, float deltaX, float deltaY) {
         cameraTargetPos.set(deltaX, deltaY, 0);
 
-        cameraTargetPos.set(mCamera.unproject(vec3Zero).add(mCamera.unproject(cameraTargetPos).scl(-1f)));
+        cameraTargetPos.set(viewport.unproject(vec3Zero.scl(0)).add(viewport.unproject(cameraTargetPos).scl(-1f)));
 
         cameraTargetPos.add(mCamera.position);
         return true;