diff --git a/src/components/Swap/TokenInput.tsx b/src/components/Swap/TokenInput.tsx
index 7caa96bda..bb7884921 100644
--- a/src/components/Swap/TokenInput.tsx
+++ b/src/components/Swap/TokenInput.tsx
@@ -101,6 +101,7 @@ export const TokenInput = forwardRef<TokenInputHandle, PropsWithChildren<TokenIn
           onSelect={onSelect}
           chainIdsAllowed={chainIdsAllowed}
           tokenList={tokenList}
+          hasPresetValue={tokenList.length === 1}
         />
         <ThemedText.H2>
           <ValueInput
diff --git a/src/components/TokenSelect/TokenButton.tsx b/src/components/TokenSelect/TokenButton.tsx
index 5e691121b..293d93cde 100644
--- a/src/components/TokenSelect/TokenButton.tsx
+++ b/src/components/TokenSelect/TokenButton.tsx
@@ -3,18 +3,27 @@ import { Currency } from '@uniswap/sdk-core'
 import { getChainInfo } from 'constants/chainInfo'
 import { getNativeLogoURI } from 'hooks/useCurrencyLogoURIs'
 import { ChevronDown } from 'icons'
-import styled from 'styled-components/macro'
+import styled, { css } from 'styled-components/macro'
 import { ThemedText } from 'theme'
 
 import Button from '../Button'
 import Row from '../Row'
 import TokenImg, { ChainImgBadge, TokenGroup } from '../TokenImg'
 
+const presetValueCss = css`
+  cursor: initial;
+  :hover:enabled {
+    background-color: ${({ theme }) => theme['interactive']};
+  }
+`
+
 const StyledTokenButton = styled(Button)<{ approved?: boolean; presetValue?: boolean }>`
   border-radius: ${({ theme }) => theme.borderRadius.medium}em;
   min-height: 2em;
   padding: 0.25em 0.5em 0.25em 0.25em;
 
+  ${({ presetValue }) => presetValue && presetValueCss};
+
   :enabled {
     transition: none;
   }
@@ -54,19 +63,21 @@ interface TokenButtonProps {
   approved?: boolean
   disabled?: boolean
   onClick: () => void
+  hasPresetValue?: boolean
 }
 
-export default function TokenButton({ value, approved, disabled, onClick }: TokenButtonProps) {
+export default function TokenButton({ value, approved, disabled, onClick, hasPresetValue }: TokenButtonProps) {
   const chainInfo = getChainInfo(value?.chainId)
   const chainSrc = getNativeLogoURI(value?.chainId)
 
   return (
     <StyledTokenButton
-      onClick={onClick}
+      onClick={hasPresetValue ? undefined : onClick}
       color={value ? 'interactive' : 'accent'}
       approved={approved}
       disabled={disabled}
       data-testid="token-select"
+      presetValue={hasPresetValue}
     >
       <TokenButtonRow empty={!value} flex gap={0.4}>
         {value ? (
@@ -85,7 +96,7 @@ export default function TokenButton({ value, approved, disabled, onClick }: Toke
             <Trans>Select token</Trans>
           </ThemedText.ButtonLarge>
         )}
-        <DropDownIcon strokeWidth={2} color={value ? 'primary' : 'onAccent'} />
+        {!hasPresetValue && <DropDownIcon strokeWidth={2} color={value ? 'primary' : 'onAccent'} />}
       </TokenButtonRow>
     </StyledTokenButton>
   )
diff --git a/src/components/TokenSelect/index.tsx b/src/components/TokenSelect/index.tsx
index 93ca74d88..60c18e011 100644
--- a/src/components/TokenSelect/index.tsx
+++ b/src/components/TokenSelect/index.tsx
@@ -164,6 +164,7 @@ interface TokenSelectProps {
   onSelect: (value: Currency) => void
   chainIdsAllowed: number[]
   tokenList: TokenListItem[]
+  hasPresetValue?: boolean
 }
 
 export default memo(function TokenSelect({
@@ -174,6 +175,7 @@ export default memo(function TokenSelect({
   onSelect,
   chainIdsAllowed,
   tokenList,
+  hasPresetValue,
 }: TokenSelectProps) {
   usePrefetchBalances()
 
@@ -191,7 +193,13 @@ export default memo(function TokenSelect({
   )
   return (
     <>
-      <TokenButton value={value} approved={approved} disabled={disabled} onClick={onOpen} />
+      <TokenButton
+        value={value}
+        approved={approved}
+        disabled={disabled}
+        onClick={onOpen}
+        hasPresetValue={hasPresetValue}
+      />
       {open && (
         <TokenSelectDialog
           value={value}