diff --git a/src/components/Router/index.jsx b/src/components/Router/index.jsx
index f4cc6cc4b..a93712fd3 100644
--- a/src/components/Router/index.jsx
+++ b/src/components/Router/index.jsx
@@ -167,10 +167,16 @@ export const Router = () => {
                       index={true}
                       lazy={() => import('../shared/Files/Files/index.jsx')}
                     />
-                    <Route
-                      path=":fileId/Vorschau"
-                      lazy={() => import('../shared/Files/Preview/index.jsx')}
-                    />
+                    <Route path=":fileId">
+                      <Route
+                        path="*"
+                        lazy={() => import('../shared/Files/Preview/index.jsx')}
+                      />
+                      <Route
+                        path="Vorschau"
+                        lazy={() => import('../shared/Files/Preview/index.jsx')}
+                      />
+                    </Route>
                   </Route>
                   <Route
                     path="Historien"
@@ -394,10 +400,16 @@ export const Router = () => {
                       index={true}
                       lazy={() => import('../shared/Files/Files/index.jsx')}
                     />
-                    <Route
-                      path=":fileId/Vorschau"
-                      lazy={() => import('../shared/Files/Preview/index.jsx')}
-                    />
+                    <Route path=":fileId">
+                      <Route
+                        index={true}
+                        lazy={() => import('../shared/Files/Preview/index.jsx')}
+                      />
+                      <Route
+                        path="Vorschau"
+                        lazy={() => import('../shared/Files/Preview/index.jsx')}
+                      />
+                    </Route>
                   </Route>
                   <Route
                     path="Historien"
diff --git a/src/components/shared/Files/Menu/index.jsx b/src/components/shared/Files/Menu/index.jsx
index ac7daa50e..589ff6214 100644
--- a/src/components/shared/Files/Menu/index.jsx
+++ b/src/components/shared/Files/Menu/index.jsx
@@ -51,7 +51,7 @@ export const Menu = memo(
     const { fileId } = useParams()
     const navigate = useNavigate()
     const { pathname } = useLocation()
-    const isPreview = pathname.endsWith('Vorschau')
+    const isPreview = pathname.endsWith('Vorschau') || pathname.includes(fileId)
     const client = useApolloClient()
     const uploaderCtx = useContext(UploaderContext)
     const api = uploaderCtx?.current?.getAPI?.()