diff --git a/packages/bridge/package.json b/packages/bridge/package.json
index ee06815..058df68 100644
--- a/packages/bridge/package.json
+++ b/packages/bridge/package.json
@@ -20,6 +20,7 @@
     "@types/chart.js": "^2.9.29",
     "@types/echarts": "^4.9.0",
     "@types/react-router-dom": "^5.1.6",
+    "@types/react-virtualized": "^9.21.11",
     "@types/testing-library__react": "^10.2.0",
     "@uniswap/token-lists": "^1.0.0-beta.19",
     "@walletconnect/client": "^1.3.6",
@@ -52,6 +53,7 @@
     "react-router-dom": "^5.2.0",
     "react-scripts": "3.4.3",
     "react-three-fiber": "^5.3.18",
+    "react-virtualized": "^9.22.3",
     "three": "^0.125.2",
     "typescript": "^4.1.3",
     "use-wallet": "^0.8.1"
diff --git a/packages/bridge/src/components/Input/style.less b/packages/bridge/src/components/Input/style.less
index 0421274..1fd4b7d 100644
--- a/packages/bridge/src/components/Input/style.less
+++ b/packages/bridge/src/components/Input/style.less
@@ -10,7 +10,7 @@
 
 .multichain-option-name {
   display: flex;
-  flex-direction: row;
+  flex-direction: column;
 }
 
 .ccy-input {
diff --git a/packages/bridge/src/components/TokenSelectModal/index.tsx b/packages/bridge/src/components/TokenSelectModal/index.tsx
index 446adb6..57b5835 100644
--- a/packages/bridge/src/components/TokenSelectModal/index.tsx
+++ b/packages/bridge/src/components/TokenSelectModal/index.tsx
@@ -1,4 +1,7 @@
 import React, { useMemo, useState } from 'react';
+import List from 'react-virtualized/dist/commonjs/List';
+import AutoSizer from 'react-virtualized/dist/commonjs/AutoSizer';
+import _ from 'lodash';
 import './style.less';
 import { Modal, Input } from 'antd';
 import { useEthereum } from '../../contexts';
@@ -15,6 +18,18 @@ export const TokenSelectModal = (props: {
   const [selected, setSelected] = useState<string>('');
   const [search, setSearch] = useState<string>('');
 
+  const tokenList = useMemo(() => {
+    if (tokens && search) {
+      return tokens.filter(token => {
+        return (
+          (token.tags?.indexOf('longList') || -1) < 0 &&
+          token.symbol.includes(search.toUpperCase())
+        );
+      });
+    }
+    return tokens;
+  }, [tokens, search]);
+
   const showModal = () => {
     setIsModalVisible(true);
   };
@@ -29,43 +44,38 @@ export const TokenSelectModal = (props: {
     return tokens.find(el => el.address === selected);
   }, [selected, tokens, props.asset]);
 
-  const renderTokensChain = useMemo(() => {
-    return tokens
-      .filter(
-        t =>
-          (t.tags?.indexOf('longList') || -1) < 0 &&
-          search &&
-          search.length >= 3 &&
-          t.symbol.includes(search.toUpperCase()),
-      )
-      .map(token => {
-        const mint = token.address;
-        return (
+  const delayedSearchChange = _.debounce(val => {
+    setSearch(val);
+  });
+
+  const rowRender = (rowProps: { index: number; key: string; style: any }) => {
+    const token = tokenList[rowProps.index];
+    const mint = token.address;
+    return (
+      <div
+        key={rowProps.key}
+        className="multichain-option"
+        title={token.name}
+        onClick={() => {
+          props.onSelectToken(mint);
+          setSelected(mint);
+          hideModal();
+        }}
+        style={{ ...rowProps.style, cursor: 'pointer' }}
+      >
+        <div className="multichain-option-content">
+          <TokenDisplay asset={props.asset} token={token} chain={props.chain} />
           <div
-            key={mint}
-            className="multichain-option"
-            title={token.name}
-            onClick={() => {
-              props.onSelectToken(mint);
-              setSelected(mint);
-              hideModal();
-            }}
-            style={{ cursor: 'pointer' }}
+            className="multichain-option-name"
+            style={{ marginLeft: '20px' }}
           >
-            <div className="multichain-option-content">
-              <TokenDisplay
-                asset={props.asset}
-                token={token}
-                chain={props.chain}
-              />
-              <div className="multichain-option-name">
-                <span className={'token-name'}>{token.symbol}</span>
-              </div>
-            </div>
+            <em className={'token-symbol'}>{token.symbol}</em>
+            <span className={'token-name'}>{token.name}</span>
           </div>
-        );
-      });
-  }, [search, tokens]);
+        </div>
+      </div>
+    );
+  };
 
   return (
     <>
@@ -93,11 +103,28 @@ export const TokenSelectModal = (props: {
       >
         <Input
           className={'input-token-search'}
-          placeholder={'ETH, SOL, ... etc'}
+          placeholder={'SOL, SRM, ... etc'}
           value={search}
-          onChange={e => setSearch(e.target.value)}
+          onChange={e => {
+            e.persist();
+            delayedSearchChange(e.target.value);
+          }}
         />
-        <div className={'assets-scroll'}>{[...renderTokensChain]}</div>
+        <div style={{ height: '90%' }}>
+          <AutoSizer>
+            {({ width, height }) => (
+              <List
+                ref="List"
+                height={height}
+                rowHeight={70}
+                rowCount={tokenList.length || 0}
+                rowRenderer={rowRender}
+                width={width}
+              />
+            )}
+          </AutoSizer>
+        </div>
+        {/*<div className={'assets-scroll'}>{[...renderTokensChain]}</div>*/}
       </Modal>
     </>
   );
diff --git a/packages/bridge/src/components/TokenSelectModal/style.less b/packages/bridge/src/components/TokenSelectModal/style.less
index 2b8ae12..4200838 100644
--- a/packages/bridge/src/components/TokenSelectModal/style.less
+++ b/packages/bridge/src/components/TokenSelectModal/style.less
@@ -5,3 +5,21 @@
   height: 60vh;
   overflow: auto;
 }
+
+.ant-modal-body {
+  height: 80vh;
+  ::-webkit-scrollbar-track {
+	border-radius: 5px;
+	background-color: transparent;
+  }
+  ::-webkit-scrollbar {
+	width: 7px;
+	background-color: transparent;
+  }
+  ::-webkit-scrollbar-thumb {
+	border-radius: 5px;
+    height: 50px;
+	-webkit-box-shadow: inset 0 0 30px rgba(0,0,0,.3);
+	background-color: #555;
+  }
+}
diff --git a/packages/bridge/src/contexts/ethereum.tsx b/packages/bridge/src/contexts/ethereum.tsx
index 999cc32..01c404b 100644
--- a/packages/bridge/src/contexts/ethereum.tsx
+++ b/packages/bridge/src/contexts/ethereum.tsx
@@ -53,7 +53,7 @@ export const EthereumProvider: FunctionComponent = ({ children }) => {
         fetch('https://gateway.ipfs.io/ipns/tokens.uniswap.org').then(_ =>
           _.json(),
         ),
-        fetch('https://tokenlist.aave.eth.link/').then(_ => _.json()),
+        //fetch('https://tokenlist.aave.eth.link/').then(_ => _.json()),
         fetch('https://tokens.coingecko.com/uniswap/all.json').then(_ =>
           _.json(),
         ),