diff --git a/ui/app/pages/swaps/build-quote/build-quote.js b/ui/app/pages/swaps/build-quote/build-quote.js
index 1a03c7831..76388b1aa 100644
--- a/ui/app/pages/swaps/build-quote/build-quote.js
+++ b/ui/app/pages/swaps/build-quote/build-quote.js
@@ -212,6 +212,7 @@ export default function BuildQuote ({
           selectPlaceHolderText="Select"
           hideItemIf={(item) => item.address === selectedToToken?.address}
           listContainerClassName="build-quote__open-dropdown"
+          autoFocus
         />
         <div
           className={classnames('build-quote__balance-message', {
diff --git a/ui/app/pages/swaps/dropdown-input-pair/dropdown-input-pair.js b/ui/app/pages/swaps/dropdown-input-pair/dropdown-input-pair.js
index d26d438e9..9176247f3 100644
--- a/ui/app/pages/swaps/dropdown-input-pair/dropdown-input-pair.js
+++ b/ui/app/pages/swaps/dropdown-input-pair/dropdown-input-pair.js
@@ -36,6 +36,7 @@ export default function DropdownInputPair ({
   loading,
   hideItemIf,
   listContainerClassName,
+  autoFocus,
 }) {
   const [isOpen, setIsOpen] = useState(false)
   const open = () => setIsOpen(true)
@@ -91,7 +92,8 @@ export default function DropdownInputPair ({
           onChange={onTextFieldChange}
           fullWidth
           margin="dense"
-          value={ inputValue }
+          value={inputValue}
+          autoFocus={autoFocus}
         />
       )}
       {
@@ -123,4 +125,5 @@ DropdownInputPair.propTypes = {
   loading: PropTypes.bool,
   hideItemIf: PropTypes.func,
   listContainerClassName: PropTypes.string,
+  autoFocus: PropTypes.bool,
 }