diff --git a/src/components/PhotoList.tsx b/src/components/PhotoList.tsx
index 477e7634b..901d85f9b 100644
--- a/src/components/PhotoList.tsx
+++ b/src/components/PhotoList.tsx
@@ -1,7 +1,7 @@
 import React, { useRef, useEffect } from 'react';
 import { VariableSizeList as List } from 'react-window';
 import styled from 'styled-components';
-
+import { File } from 'services/fileService';
 import {
     IMAGE_CONTAINER_MAX_WIDTH,
     IMAGE_CONTAINER_MAX_HEIGHT,
@@ -90,6 +90,16 @@ const BannerContainer = styled.div<{ span: number }>`
     align-items: flex-end;
 `;
 
+interface Props {
+    height: number;
+    width: number;
+    filteredData: File[];
+    showBanner: boolean;
+    getThumbnail: (file: File[], index: number) => JSX.Element;
+    activeCollection: number;
+    resetFetching: () => void;
+}
+
 export function PhotoList({
     height,
     width,
@@ -97,11 +107,20 @@ export function PhotoList({
     showBanner,
     getThumbnail,
     activeCollection,
-}) {
-    let columns = Math.floor(width / IMAGE_CONTAINER_MAX_WIDTH);
-    let listItemHeight = IMAGE_CONTAINER_MAX_HEIGHT;
+    resetFetching,
+}: Props) {
     const timeStampListRef = useRef([]);
     const timeStampList = timeStampListRef?.current ?? [];
+    const listRef = useRef(null);
+
+    let columns = Math.floor(width / IMAGE_CONTAINER_MAX_WIDTH);
+    let listItemHeight = IMAGE_CONTAINER_MAX_HEIGHT;
+
+    useEffect(() => {
+        listRef.current?.resetAfterIndex(0);
+        resetFetching();
+    }, [filteredData]);
+
     useEffect(() => {
         let skipMerge = false;
         if (columns < MIN_COLUMNS) {
@@ -335,7 +354,7 @@ export function PhotoList({
     return (
         <List
             key={`${columns}-${listItemHeight}-${activeCollection}`}
-            // ref={listRef}
+            ref={listRef}
             itemSize={getItemSize}
             height={height}
             width={width}
diff --git a/src/components/PhotoWall.tsx b/src/components/PhotoWall.tsx
index 1f9d0c960..9082a63a5 100644
--- a/src/components/PhotoWall.tsx
+++ b/src/components/PhotoWall.tsx
@@ -92,7 +92,6 @@ const PhotoWall = ({
     const [fetching, setFetching] = useState<{ [k: number]: boolean }>({});
     const startTime = Date.now();
     const galleryContext = useContext(GalleryContext);
-    const listRef = useRef(null);
     const [rangeStart, setRangeStart] = useState(null);
     const [currentHover, setCurrentHover] = useState(null);
     const [isShiftKeyPressed, setIsShiftKeyPressed] = useState(false);
@@ -134,10 +133,9 @@ const PhotoWall = ({
         }
     }, [search]);
 
-    useEffect(() => {
-        listRef.current?.resetAfterIndex(0);
+    const resetFetching = () => {
         setFetching({});
-    }, [files, search, deleted]);
+    };
 
     useEffect(() => {
         if (selected.count === 0) {
@@ -415,6 +413,7 @@ const PhotoWall = ({
                                 showBanner={
                                     files.length < 30 && !isInSearchMode
                                 }
+                                resetFetching={resetFetching}
                             />
                         )}
                     </AutoSizer>