Merge branch 'fix-select-location-pop-scroll-position'

1 files changed, 10 insertions, 0 deletions

diff --git a/gui/src/renderer/components/select-location/ScrollPositionContext.tsx b/gui/src/renderer/components/select-location/ScrollPositionContext.tsx
index 04fcd0bccc..d27e252427 100644
--- a/gui/src/renderer/components/select-location/ScrollPositionContext.tsx
+++ b/gui/src/renderer/components/select-location/ScrollPositionContext.tsx
@@ -1,5 +1,7 @@
+import { Action } from 'history';
 import React, { useCallback, useContext, useEffect, useMemo, useRef } from 'react';
 
+import { useHistory } from '../../lib/history';
 import { useNormalRelaySettings, useStyledRef } from '../../lib/utilityHooks';
 import { CustomScrollbarsRef } from '../CustomScrollbars';
 import { LocationType } from './select-location-types';
@@ -37,6 +39,9 @@ export function ScrollPositionContextProvider(props: ScrollPositionContextProps)
   const { locationType, searchTerm } = useSelectLocationContext();
   const relaySettings = useNormalRelaySettings();
 
+  const { action } = useHistory();
+  const recentNavigationAction = useRef<Action | null>(action);
+
   const scrollPositions = useRef<Partial<Record<LocationType, ScrollPosition>>>({});
   const scrollViewRef = useRef<CustomScrollbarsRef>(null);
   const spacePreAllocationViewRef = useStyledRef<SpacePreAllocationView>();
@@ -82,6 +87,11 @@ export function ScrollPositionContextProvider(props: ScrollPositionContextProps)
 
   // Restore the scroll position when parameters change
   useEffect(() => {
+    if (recentNavigationAction.current === 'POP') {
+      recentNavigationAction.current = null;
+      return;
+    }
+
     const scrollPosition = scrollPositions.current?.[locationType];
     if (scrollPosition) {
       scrollViewRef.current?.scrollTo(...scrollPosition);