diff --git a/src/components/DestinationPicker.tsx b/src/components/DestinationPicker.tsx
index e7c4fd5146b56..9f1ec98ad210a 100644
--- a/src/components/DestinationPicker.tsx
+++ b/src/components/DestinationPicker.tsx
@@ -76,7 +76,6 @@ function DestinationPicker({selectedDestination, policyID, onSubmit, ref}: Desti
     return (
         <SelectionList
             ref={ref}
-            key={selectedDestination}
             sections={sections}
             shouldShowTextInput={shouldShowTextInput}
             textInputOptions={textInputOptions}
@@ -85,7 +84,6 @@ function DestinationPicker({selectedDestination, policyID, onSubmit, ref}: Desti
             initiallyFocusedItemKey={selectedOptionKey}
             shouldHideKeyboardOnScroll={false}
             shouldUpdateFocusedIndex
-            disableMaintainingScrollPosition
         />
     );
 }
diff --git a/src/components/SelectionList/hooks/useFlattenedSections.ts b/src/components/SelectionList/hooks/useFlattenedSections.ts
index 6ea493e2d92c8..6e0e78bb09e21 100644
--- a/src/components/SelectionList/hooks/useFlattenedSections.ts
+++ b/src/components/SelectionList/hooks/useFlattenedSections.ts
@@ -67,7 +67,7 @@ function useFlattenedSections<TItem extends ListItem>(sections: Array<Section<TI
                 } as SectionListItem<TItem>;
                 data.push(itemData);
 
-                if (item.keyForList === initiallyFocusedItemKey) {
+                if (item.keyForList === initiallyFocusedItemKey && focusedIndex === -1) {
                     focusedIndex = currentIndex;
                 }