diff --git a/src/pages/Swap/index.tsx b/src/pages/Swap/index.tsx
index d00593132a..b5ce8f91eb 100644
--- a/src/pages/Swap/index.tsx
+++ b/src/pages/Swap/index.tsx
@@ -710,10 +710,14 @@ export function Swap({
                 loading={independentField === Field.INPUT && routeIsSyncing}
                 numericalInputSettings={{
                   // We disable numerical input here if the selected token has tax, since we cannot guarantee exact_outputs for FOT tokens
-                  disabled: outputTokenHasTax,
+                  disabled: inputTokenHasTax || outputTokenHasTax,
                   // Focus the input currency panel if the user tries to type into the disabled output currency panel
                   onDisabledClick: () => inputCurrencyNumericalInputRef.current?.focus(),
-                  disabledTooltipBody: <OutputTaxTooltipBody currencySymbol={currencies[Field.OUTPUT]?.symbol} />,
+                  disabledTooltipBody: (
+                    <OutputTaxTooltipBody
+                      currencySymbol={currencies[inputTokenHasTax ? Field.INPUT : Field.OUTPUT]?.symbol}
+                    />
+                  ),
                 }}
               />
             </Trace>