diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 4a79260..f18d1a3 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -40,9 +40,13 @@
               });
           });
 
-          // Event-Handler für korrektes Zurücksetzen nach Schließen
           modalElement.addEventListener('hidden.bs.modal', function () {
+              // Entferne überschüssige Klassen & Styles, falls Bootstrap sie hängen lässt
               document.body.classList.remove('modal-open');
+              document.body.style.overflow = '';
+              document.body.style.paddingRight = '';
+
+              // Entferne eventuell verbliebene Backdrops
               const backdrops = document.querySelectorAll('.modal-backdrop');
               backdrops.forEach(b => b.parentNode.removeChild(b));
           });
@@ -280,3 +284,20 @@
     });
 </script>
 
+
+<script>
+    document.addEventListener("turbo:before-cache", () => {
+        document.querySelectorAll(".modal.show").forEach(modal => {
+            bootstrap.Modal.getInstance(modal)?.hide();
+        });
+    });
+</script>
+<script>
+    document.addEventListener('hidden.bs.modal', function (event) {
+        // Cleanup-Fix falls scrollen blockiert bleibt
+        if (document.body.classList.contains('modal-open')) {
+            document.body.classList.remove('modal-open');
+            document.body.style.overflow = '';
+        }
+    });
+</script>
\ No newline at end of file