diff --git a/src/video_display.cpp b/src/video_display.cpp
index 8598eae5c..ebee959be 100644
--- a/src/video_display.cpp
+++ b/src/video_display.cpp
@@ -407,9 +407,10 @@ void VideoDisplay::OnMouseLeave(wxMouseEvent& event) {
 }
 
 void VideoDisplay::OnMouseWheel(wxMouseEvent& event) {
+	bool videoPan = OPT_GET("Video/Video Pan")->GetBool();
 	if (int wheel = event.GetWheelRotation()) {
 		if (ForwardMouseWheelEvent(this, event))
-			if (event.ControlDown())
+			if (event.ControlDown() || !videoPan)
 				SetWindowZoom(windowZoomValue + .125 * (wheel / event.GetWheelDelta()));
 			else
 				SetVideoZoom(wheel / event.GetWheelDelta());