diff --git a/src/static/js/tutorial.js b/src/static/js/tutorial.js
index fc7c276..4b14db5 100644
--- a/src/static/js/tutorial.js
+++ b/src/static/js/tutorial.js
@@ -1542,6 +1542,15 @@ const Tutorial = {
         }
 
         var rect = el.getBoundingClientRect();
+        // Fuer Modal-Steps: horizontale Positionierung am Modal, vertikale am Feld
+        if (step.bubbleTarget && step.target && step.target.indexOf('#modal-') !== -1) {
+            var modalEl = document.querySelector(step.target);
+            if (modalEl) {
+                var modalRect = modalEl.getBoundingClientRect();
+                rect = { top: rect.top, bottom: rect.bottom, left: modalRect.left, right: modalRect.right,
+                         width: modalRect.width, height: rect.height };
+            }
+        }
         var vw = window.innerWidth;
         var vh = window.innerHeight;
         var gap = 16;