diff --git a/common/lc_model.cpp b/common/lc_model.cpp
index 586158c6..68ebadd8 100644
--- a/common/lc_model.cpp
+++ b/common/lc_model.cpp
@@ -4187,8 +4187,7 @@ void lcModel::UpdateZoomTool(lcCamera* Camera, float Mouse)
 
 void lcModel::UpdatePanTool(lcCamera* Camera, const lcVector3& Distance)
 {
-	Camera->Pan(Distance - mMouseToolDistance, mCurrentStep, gMainWindow->GetAddKeys());
-	mMouseToolDistance = Distance;
+	Camera->Pan(Distance, mCurrentStep, gMainWindow->GetAddKeys());
 
 	UpdateAllViews();
 }
diff --git a/common/lc_view.cpp b/common/lc_view.cpp
index 8dd6f2e0..71d6c93c 100644
--- a/common/lc_view.cpp
+++ b/common/lc_view.cpp
@@ -2178,6 +2178,73 @@ void lcView::StartOrbitTracking()
 	OnButtonDown(lcTrackButton::Left);
 }
 
+void lcView::StartPanGesture()
+{
+	lcModel* ActiveModel = GetActiveModel();
+
+	StartPan(mWidth / 2, mHeight / 2);
+	ActiveModel->BeginMouseTool();
+}
+
+void lcView::UpdatePanGesture(int dx, int dy)
+{
+	UpdatePan(mPanX + dx, mPanY + dy);
+}
+
+void lcView::StartPan(int x, int y)
+{
+	mPanX = x;
+	mPanY = y;
+}
+
+void lcView::UpdatePan(int x, int y)
+{
+	if (x == mPanX && y == mPanY)
+		return;
+
+	lcModel* ActiveModel = GetActiveModel();
+
+	lcVector3 Points[4] =
+	{
+	    lcVector3((float)x, (float)y, 0.0f),
+	    lcVector3((float)x, (float)y, 1.0f),
+	    lcVector3(mPanX, mPanY, 0.0f),
+	    lcVector3(mPanX, mPanY, 1.0f)
+	};
+
+	UnprojectPoints(Points, 4);
+
+	const lcVector3& CurrentStart = Points[0];
+	const lcVector3& CurrentEnd = Points[1];
+	const lcVector3& MouseDownStart = Points[2];
+	const lcVector3& MouseDownEnd = Points[3];
+	lcVector3 Center = ActiveModel->GetSelectionOrModelCenter();
+
+	lcVector3 PlaneNormal(mCamera->mPosition - mCamera->mTargetPosition);
+	lcVector4 Plane(PlaneNormal, -lcDot(PlaneNormal, Center));
+	lcVector3 Intersection, MoveStart;
+
+	if (!lcLineSegmentPlaneIntersection(&Intersection, CurrentStart, CurrentEnd, Plane) || !lcLineSegmentPlaneIntersection(&MoveStart, MouseDownStart, MouseDownEnd, Plane))
+	{
+		Center = MouseDownStart + lcNormalize(MouseDownEnd - MouseDownStart) * 10.0f;
+		Plane = lcVector4(PlaneNormal, -lcDot(PlaneNormal, Center));
+
+		if (!lcLineSegmentPlaneIntersection(&Intersection, CurrentStart, CurrentEnd, Plane) || !lcLineSegmentPlaneIntersection(&MoveStart, MouseDownStart, MouseDownEnd, Plane))
+			return;
+	}
+
+	mPanX = x;
+	mPanY = y;
+
+	ActiveModel->UpdatePanTool(mCamera, MoveStart - Intersection);
+}
+
+void lcView::EndPanGesture(bool Accept)
+{
+	lcModel* ActiveModel = GetActiveModel();
+
+	ActiveModel->EndMouseTool(lcTool::Pan, Accept);
+}
 
 void lcView::StartTracking(lcTrackButton TrackButton)
 {
@@ -2223,8 +2290,12 @@ void lcView::StartTracking(lcTrackButton TrackButton)
 		case lcTool::ColorPicker:
 			break;
 
-		case lcTool::Zoom:
-		case lcTool::Pan:
+	    case lcTool::Pan:
+		    StartPan(mMouseX, mMouseY);
+			ActiveModel->BeginMouseTool();
+		    break;
+
+	    case lcTool::Zoom:
 		case lcTool::RotateView:
 		case lcTool::Roll:
 			ActiveModel->BeginMouseTool();
@@ -2864,38 +2935,7 @@ void lcView::OnMouseMove()
 		break;
 
 	case lcTrackTool::Pan:
-		{
-			lcVector3 Points[4] =
-			{
-				lcVector3((float)mMouseX, (float)mMouseY, 0.0f),
-				lcVector3((float)mMouseX, (float)mMouseY, 1.0f),
-				lcVector3(mMouseDownX, mMouseDownY, 0.0f),
-				lcVector3(mMouseDownX, mMouseDownY, 1.0f)
-			};
-
-			UnprojectPoints(Points, 4);
-
-			const lcVector3& CurrentStart = Points[0];
-			const lcVector3& CurrentEnd = Points[1];
-			const lcVector3& MouseDownStart = Points[2];
-			const lcVector3& MouseDownEnd = Points[3];
-			lcVector3 Center = ActiveModel->GetSelectionOrModelCenter();
-
-			lcVector3 PlaneNormal(mCamera->mPosition - mCamera->mTargetPosition);
-			lcVector4 Plane(PlaneNormal, -lcDot(PlaneNormal, Center));
-			lcVector3 Intersection, MoveStart;
-
-			if (!lcLineSegmentPlaneIntersection(&Intersection, CurrentStart, CurrentEnd, Plane) || !lcLineSegmentPlaneIntersection(&MoveStart, MouseDownStart, MouseDownEnd, Plane))
-			{
-				Center = MouseDownStart + lcNormalize(MouseDownEnd - MouseDownStart) * 10.0f;
-				Plane = lcVector4(PlaneNormal, -lcDot(PlaneNormal, Center));
-
-				if (!lcLineSegmentPlaneIntersection(&Intersection, CurrentStart, CurrentEnd, Plane) || !lcLineSegmentPlaneIntersection(&MoveStart, MouseDownStart, MouseDownEnd, Plane))
-					break;
-			}
-
-			ActiveModel->UpdatePanTool(mCamera, MoveStart - Intersection);
-		}
+		UpdatePan(mMouseX, mMouseY);
 		break;
 
 	case lcTrackTool::OrbitX:
diff --git a/common/lc_view.h b/common/lc_view.h
index 7d86453b..e7c8d27f 100644
--- a/common/lc_view.h
+++ b/common/lc_view.h
@@ -227,6 +227,9 @@ public:
 	void EndDrag(bool Accept);
 
 	void UpdateCursor();
+	void StartPanGesture();
+	void UpdatePanGesture(int dx, int dy);
+	void EndPanGesture(bool Accept);
 	void StartOrbitTracking();
 	void CancelTrackingOrClearSelection();
 
@@ -298,6 +301,8 @@ protected:
 	void StartTracking(lcTrackButton TrackButton);
 	void StopTracking(bool Accept);
 	void OnButtonDown(lcTrackButton TrackButton);
+	void StartPan(int x, int y);
+	void UpdatePan(int x, int y);
 
 	lcViewWidget* mWidget = nullptr;
 	int mWidth = 1;
@@ -321,6 +326,8 @@ protected:
 	bool mTrackToolFromOverlay;
 	lcVector3 mMouseDownPosition;
 	PieceInfo* mMouseDownPiece;
+	int mPanX = 0;
+	int mPanY = 0;
 
 	QImage mRenderImage;
 	std::unique_ptr<QOpenGLFramebufferObject> mRenderFramebuffer;
diff --git a/common/lc_viewwidget.cpp b/common/lc_viewwidget.cpp
index 41c88b66..a30b492f 100644
--- a/common/lc_viewwidget.cpp
+++ b/common/lc_viewwidget.cpp
@@ -217,6 +217,31 @@ void lcViewWidget::mouseMoveEvent(QMouseEvent* MouseEvent)
 
 void lcViewWidget::wheelEvent(QWheelEvent* WheelEvent)
 {
+	if (WheelEvent->source() == Qt::MouseEventSynthesizedBySystem)
+	{
+		switch (WheelEvent->phase())
+		{
+		case Qt::NoScrollPhase:
+			break;
+
+		case Qt::ScrollBegin:
+			mView->StartPanGesture();
+			WheelEvent->accept();
+			return;
+
+		case Qt::ScrollUpdate:
+		case Qt::ScrollMomentum:
+			mView->UpdatePanGesture(WheelEvent->pixelDelta().x(), -WheelEvent->pixelDelta().y());
+			WheelEvent->accept();
+			return;
+
+		case Qt::ScrollEnd:
+			mView->EndPanGesture(true);
+			WheelEvent->accept();
+			return;
+		}
+	}
+
 	if (WheelEvent->angleDelta().y() == 0)
 	{
 		WheelEvent->ignore();