diff --git a/src/components/EvmChainSelect.tsx b/src/components/EvmChainSelect.tsx
index 2c78e76..b8baead 100644
--- a/src/components/EvmChainSelect.tsx
+++ b/src/components/EvmChainSelect.tsx
@@ -1,14 +1,5 @@
 import React, { useEffect, useState } from "react";
-import {
-  Button,
-  Menu,
-  MenuButton,
-  MenuList,
-  MenuItem,
-  MenuGroup,
-  MenuDivider,
-} from "@chakra-ui/react";
-import { ChevronDownIcon } from "@chakra-ui/icons";
+import { Select } from "@chakra-ui/react";
 import { ReactJSXElement } from "@emotion/react/types/jsx-namespace";
 import { supportedChains, bloctoSDK, useEthereum } from "../services/evm";
 
@@ -21,70 +12,31 @@ const supportedTestnetChains = supportedChains.filter(
 
 const EvmChainSelect: React.FC = ({}): ReactJSXElement => {
   const { chainId: currentChainId } = useEthereum();
-  const [chainName, setChainName] = useState(
-    supportedChains.find(({ chainId }) => chainId === currentChainId)?.name ||
-      "Ethereum Goerli"
-  );
-  useEffect(() => {
-    const chainName = supportedChains.find(
-      ({ chainId }) => chainId === currentChainId
-    )?.name;
-    if (chainName) {
-      setChainName(chainName);
-    }
-  }, [currentChainId]);
 
   return (
-    <Menu>
-      <MenuButton as={Button} rightIcon={<ChevronDownIcon />} width="200px">
-        {chainName}
-      </MenuButton>
-      <MenuList>
-        <MenuGroup title="Testnet">
-          {supportedTestnetChains.map(({ name, chainId }) => (
-            <MenuItem
-              key={chainId}
-              pl={5}
-              color="gray.700"
-              onClick={() => {
-                bloctoSDK.ethereum
-                  .request({
-                    method: "wallet_switchEthereumChain",
-                    params: [{ chainId }],
-                  })
-                  .then(() => {
-                    setChainName(name);
-                  });
-              }}
-            >
-              {name}
-            </MenuItem>
-          ))}
-        </MenuGroup>
-        <MenuDivider />
-        <MenuGroup title="Mainnet">
-          {supportedMainnetChains.map(({ name, chainId }) => (
-            <MenuItem
-              key={chainId}
-              pl={5}
-              color="gray.700"
-              onClick={() => {
-                bloctoSDK.ethereum
-                  .request({
-                    method: "wallet_switchEthereumChain",
-                    params: [{ chainId }],
-                  })
-                  .then(() => {
-                    setChainName(name);
-                  });
-              }}
-            >
-              {name}
-            </MenuItem>
-          ))}
-        </MenuGroup>
-      </MenuList>
-    </Menu>
+    <Select
+      width="200px"
+      value={currentChainId || ""}
+      onChange={(e) => {
+        bloctoSDK.ethereum.request({
+          method: "wallet_switchEthereumChain",
+          params: [{ chainId: e.target.value }],
+        });
+      }}
+    >
+      <option disabled>Testnet</option>
+      {supportedTestnetChains.map(({ name, chainId }) => (
+        <option key={chainId} value={chainId}>
+          {name}
+        </option>
+      ))}
+      <option disabled>Mainnet</option>
+      {supportedMainnetChains.map(({ name, chainId }) => (
+        <option key={chainId} value={chainId}>
+          {name}
+        </option>
+      ))}
+    </Select>
   );
 };
 
diff --git a/src/components/EvmEditors/EvmTxForm.tsx b/src/components/EvmEditors/EvmTxForm.tsx
index 9260169..5ae0cf3 100644
--- a/src/components/EvmEditors/EvmTxForm.tsx
+++ b/src/components/EvmEditors/EvmTxForm.tsx
@@ -34,7 +34,11 @@ const EvmTxForm = ({
         sendObj.to = toString;
       }
       if (valueString) {
-        sendObj.value = web3.utils.toHex(valueString);
+        try {
+          sendObj.value = web3.utils.toHex(valueString);
+        } catch (e) {
+          setValue("");
+        }
       }
       if (dataString) {
         sendObj.data = dataString;