diff --git a/ui/app/pages/swaps/dropdown-search-list/dropdown-search-list.js b/ui/app/pages/swaps/dropdown-search-list/dropdown-search-list.js
index 0f6606109..cd48e5189 100644
--- a/ui/app/pages/swaps/dropdown-search-list/dropdown-search-list.js
+++ b/ui/app/pages/swaps/dropdown-search-list/dropdown-search-list.js
@@ -61,11 +61,20 @@ export default function DropdownSearchList ({
     }
   }, [externallySelectedItem, selectedItem, prevExternallySelectedItem])
 
+  const onKeyUp = (e) => {
+    if (e.key === 'Escape') {
+      close()
+    } else if (e.key === 'Enter') {
+      onClickSelector(e)
+    }
+  }
+
   return (
-    <button
+    <div
       className={classnames('dropdown-search-list', className)}
       onClick={onClickSelector}
-      onKeyUp={(e) => e.key === 'Escape' && close()}
+      onKeyUp={onKeyUp}
+      tabIndex="0"
     >
       {!isOpen && (
         <div
@@ -129,7 +138,7 @@ export default function DropdownSearchList ({
           />
         </>
       )}
-    </button>
+    </div>
   )
 }
 
diff --git a/ui/app/pages/swaps/dropdown-search-list/index.scss b/ui/app/pages/swaps/dropdown-search-list/index.scss
index f3b4b85b5..fe5bd26da 100644
--- a/ui/app/pages/swaps/dropdown-search-list/index.scss
+++ b/ui/app/pages/swaps/dropdown-search-list/index.scss
@@ -1,9 +1,4 @@
 .dropdown-search-list {
-  flex-flow: column;
-  border: none;
-  background: unset;
-  padding: 0;
-
   &__search-list-open {
     margin: 24px;
     box-shadow: none;