diff --git a/src/Camera.cpp b/src/Camera.cpp
index 3779045..8ecc86d 100644
--- a/src/Camera.cpp
+++ b/src/Camera.cpp
@@ -29,8 +29,12 @@ void Camera::mouseMoveEvent(QMouseEvent* event)
     if (event->buttons() & Qt::MiddleButton) {
         if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
             // Pan
-            setPanX(m_panX + dx / 100.0f);
-            setPanY(m_panY - dy / 100.0f);
+            float dist = -m_zoom;
+            dist = qMin(dist, 200.0f); // Cap distance to avoid crazy fast pan.
+            // Match old speed at default zoom, and have a minimum speed.
+            float panFactor = dist * 0.000495f + 0.0001f;
+            setPanX(m_panX + dx * panFactor);
+            setPanY(m_panY - dy * panFactor);
         } else {
             // Rotate
             setXRotation(m_xRot + 8 * dy);