diff --git a/course/templates/course/course_base.html b/course/templates/course/course_base.html
index 556c2884b..958707fe0 100644
--- a/course/templates/course/course_base.html
+++ b/course/templates/course/course_base.html
@@ -204,15 +204,18 @@ <h4 class="modal-title" id="unenroll-modal-title">
 {% endcomment %}
 
 <script>
-$(function() {
-	const hash = window.location.hash;
-	const target = $(hash);
-	const stickyAlert = $('.sticky-alert');
-	if (target.length > 0 && stickyAlert.length > 0) {
-		const alertHeight = stickyAlert[0].offsetHeight;
-		target.css('padding-top', alertHeight + 'px');
-	}
-});
+	$(document).ajaxStop(function(e) {
+		const stickyAlert = $('.sticky-alert');
+		if (stickyAlert.length > 0) {
+			const currentOffset = $(document).scrollTop();
+			const alertHeight = stickyAlert[0].offsetHeight;
+			if (currentOffset > alertHeight) {
+				const offset = currentOffset - alertHeight;
+				window.scrollTo({ top: offset });
+			}
+		}
+		$(this).unbind('ajaxStop');
+	});
 </script>
 
 {% endblock %}