diff --git a/client/src/pages/FolxStadlPage.tsx b/client/src/pages/FolxStadlPage.tsx
index ae3ecb5..021d40a 100644
--- a/client/src/pages/FolxStadlPage.tsx
+++ b/client/src/pages/FolxStadlPage.tsx
@@ -40,9 +40,9 @@ export default function FolxStadlPage() {
   const currentVideos = folxStadlVideos.slice(startIndex, endIndex);
 
   const handleVideoClick = (video: Video) => {
-    // Navigate to individual video page instead of modal
-    const shortId = video.id.replace(/-/g, '').substring(0, 8);
-    setLocation(`/video/${shortId}`);
+    // Open modal with navigation controls for all FOLX STADL videos
+    setSelectedVideo(video);
+    setIsModalOpen(true);
   };
 
   const handleCloseModal = () => {
diff --git a/client/src/pages/GeschichteLiedPage.tsx b/client/src/pages/GeschichteLiedPage.tsx
index 269880e..6649c42 100644
--- a/client/src/pages/GeschichteLiedPage.tsx
+++ b/client/src/pages/GeschichteLiedPage.tsx
@@ -42,9 +42,9 @@ export default function GeschichteLiedPage() {
   const currentVideos = geschichteVideos.slice(startIndex, endIndex);
 
   const handleVideoClick = (video: Video) => {
-    // Navigate to individual video page instead of modal
-    const shortId = video.id.replace(/-/g, '').substring(0, 8);
-    setLocation(`/video/${shortId}`);
+    // Open modal with navigation controls for all Geschichte des Liedes videos
+    setSelectedVideo(video);
+    setIsModalOpen(true);
   };
 
   const handleCloseModal = () => {
@@ -345,6 +345,8 @@ export default function GeschichteLiedPage() {
           video={selectedVideo}
           isOpen={isModalOpen}
           onClose={handleCloseModal}
+          videos={geschichteVideos}
+          onVideoChange={setSelectedVideo}
         />
       )}
     </div>