diff --git a/ts/components/ListView.tsx b/ts/components/ListView.tsx
index 6fee9cee86..5e62e7cc7d 100644
--- a/ts/components/ListView.tsx
+++ b/ts/components/ListView.tsx
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import classNames from 'classnames';
-import React, { useEffect, useRef, useCallback, useMemo } from 'react';
+import React, { useRef, useCallback, useMemo, useLayoutEffect } from 'react';
 import type { Index, ListRowRenderer } from 'react-virtualized';
 import { List } from 'react-virtualized';
 import { ScrollBehavior } from '../types/Util';
@@ -38,12 +38,12 @@ export function ListView({
 }: Props): JSX.Element {
   const listRef = useRef<null | List>(null);
 
-  useEffect(() => {
+  useLayoutEffect(() => {
     const list = listRef.current;
     if (shouldRecomputeRowHeights && list) {
       list.recomputeRowHeights();
     }
-  });
+  }, [shouldRecomputeRowHeights]);
 
   const rowHeight = useCallback(
     (index: Index) => calculateRowHeight(index.index),