diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp
index 960b78ebb..e5912a68f 100644
--- a/aegisub/src/audio_display.cpp
+++ b/aegisub/src/audio_display.cpp
@@ -1214,7 +1214,8 @@ void AudioDisplay::OnSelectionChanged()
 	/// @todo Handle rendering style ranges from timing controller instead
 	SampleRange sel(controller->GetPrimaryPlaybackRange());
 	scrollbar->SetSelection(AbsoluteXFromSamples(sel.begin()), AbsoluteXFromSamples(sel.length()));
-
+	if (OPT_GET("Audio/Auto/Scroll")->GetBool())
+		ScrollSampleRangeInView(sel);
 
 	int s1 = RelativeXFromSamples(sel.begin());
 	int e1 = RelativeXFromSamples(sel.end());