diff --git a/src/libresrc/default_config.json b/src/libresrc/default_config.json
index e177379b2..1d36cdcff 100644
--- a/src/libresrc/default_config.json
+++ b/src/libresrc/default_config.json
@@ -612,6 +612,7 @@
 			"Show Keyframes" : true
 		},
 		"Subtitle Sync" : true,
-		"Video Pan": false
+		"Video Pan": false,
+		"Default to UI Zoom": false
 	}
 }
diff --git a/src/libresrc/osx/default_config.json b/src/libresrc/osx/default_config.json
index c6408ec67..675c4ff82 100644
--- a/src/libresrc/osx/default_config.json
+++ b/src/libresrc/osx/default_config.json
@@ -612,6 +612,7 @@
 			"Show Keyframes" : true
 		},
 		"Subtitle Sync" : true,
-		"Video Pan": false
+		"Video Pan": false,
+		"Default to UI Zoom": false
 	}
 }
diff --git a/src/preferences.cpp b/src/preferences.cpp
index 1eb906c3a..aca48a044 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -435,6 +435,7 @@ void Advanced_Video(wxTreebook *book, Preferences *parent) {
 	p->OptionChoice(expert, _("Subtitles provider"), sp_choice, "Subtitle/Provider");
 	
 	p->OptionAdd(expert, _("Video Panning"), "Video/Video Pan");
+	p->OptionAdd(expert, _("Default to UI Zoom"), "Video/Default to UI Zoom");
 	
 
 #ifdef WITH_AVISYNTH
diff --git a/src/video_display.cpp b/src/video_display.cpp
index ebee959be..681d892ac 100644
--- a/src/video_display.cpp
+++ b/src/video_display.cpp
@@ -409,11 +409,13 @@ 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() || !videoPan)
+		if (ForwardMouseWheelEvent(this, event)) {
+			if (!videoPan || (event.ControlDown() != OPT_GET("Video/Default to UI Zoom")->GetBool())) {
 				SetWindowZoom(windowZoomValue + .125 * (wheel / event.GetWheelDelta()));
-			else
+			} else {
 				SetVideoZoom(wheel / event.GetWheelDelta());
+			}
+		}
 	}
 }