diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html
index 0e5e303..cf83ba2 100644
--- a/layouts/_default/_markup/render-heading.html
+++ b/layouts/_default/_markup/render-heading.html
@@ -1 +1 @@
-<h{{ .Level }} id="{{ .Anchor | safeURL }}"> <a class="anchor" href="#{{ .Anchor | safeURL }}">#</a> {{ .Text | safeHTML }}</h{{ .Level }}>
+<h{{ .Level }} id="{{ .Anchor | safeURL }}"> <a class="anchor" href="#{{ .Anchor | safeURL }}" data-no-prevent-default>#</a> {{ .Text | safeHTML }}</h{{ .Level }}>
diff --git a/static/src/js/app.js b/static/src/js/app.js
index 8837ffe..2b6d2d4 100644
--- a/static/src/js/app.js
+++ b/static/src/js/app.js
@@ -10,6 +10,22 @@ function waitFor(obj, property, callback) {
   }, 500);
 }
 
+function scrollTo(offset) {
+  $('html, body')
+    .stop()
+    .animate(
+      {
+        scrollTop: offset,
+      },
+      500
+    );
+}
+
+function resetHash() {
+  // Clear URL hash, without reloading the page - https://stackoverflow.com/a/15323220
+  window.history.pushState('', document.title, window.location.pathname);
+}
+
 $(document).ready(function() {
   waitFor($.fn, 'lightGallery', function() {
     $('#light-gallery').lightGallery({
@@ -41,27 +57,20 @@ $(document).ready(function() {
     mainAudio: '/audio/elevator.mp3',
     endAudio: '/audio/ding.mp3',
     preloadAudio: false,
+    endCallback: resetHash,
   });
 });
 
-function scrollTo(offset) {
-  $('html, body')
-    .stop()
-    .animate(
-      {
-        scrollTop: offset,
-      },
-      500
-    );
-}
-
 $('#scroll-top').on('click', function() {
   scrollTo(0);
-  window.history.pushState('', document.title, window.location.pathname); // Reset hash in URL
+  resetHash();
 });
 
-$('a[href^="#"] ').on('click', function(event) {
-  event.preventDefault();
+$('a[href^="#"]').on('click', function(event) {
+  if (this.dataset.noPreventDefault === undefined) {
+    event.preventDefault();
+    resetHash();
+  }
   const target = $($(this).attr('href'));
   if (target.length) {
     scrollTo(target.offset().top);