diff --git a/ui/pages/swaps/searchable-item-list/searchable-item-list.js b/ui/pages/swaps/searchable-item-list/searchable-item-list.js
index 318c2094e..d4cdaaf11 100644
--- a/ui/pages/swaps/searchable-item-list/searchable-item-list.js
+++ b/ui/pages/swaps/searchable-item-list/searchable-item-list.js
@@ -1,4 +1,4 @@
-import React, { useState, useRef } from 'react';
+import React, { useState, useRef, useMemo, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import ItemList from './item-list';
 import ListItemSearch from './list-item-search';
@@ -22,7 +22,14 @@ export default function SearchableItemList({
 }) {
   const itemListRef = useRef();
 
-  const [results, setResults] = useState(defaultToAll ? itemsToSearch : []);
+  const initialResultsState = useMemo(() => {
+    return defaultToAll ? itemsToSearch : [];
+  }, [defaultToAll, itemsToSearch]);
+  const [results, setResults] = useState(initialResultsState);
+  useEffect(() => {
+    setResults(initialResultsState);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [initialResultsState.length]);
   const [searchQuery, setSearchQuery] = useState('');
 
   return (