diff --git a/Website/components/datamodelview/List.tsx b/Website/components/datamodelview/List.tsx
index 37a77d5..bbc1cea 100644
--- a/Website/components/datamodelview/List.tsx
+++ b/Website/components/datamodelview/List.tsx
@@ -274,10 +274,13 @@ export const List = ({ setCurrentIndex, entityActiveTabs }: IListProps) => {
 
             requestAnimationFrame(() => {
                 rowVirtualizer.scrollToIndex(index, { align: 'start' });
+                // Re-selecting an aligned table does not emit a scroll event.
+                // Finish navigation once the target is mounted and aligned.
+                dispatch({ type: 'SET_LOADING_SECTION', payload: null });
             });
         };
         requestAnimationFrame(tryFix);
-    }, [rowVirtualizer]);
+    }, [rowVirtualizer, dispatch]);
 
     return (
         <>