diff --git a/projects/sdk/src/lib/swap/Swap.ts b/projects/sdk/src/lib/swap/Swap.ts
index 80ab7d8f66..138725e787 100644
--- a/projects/sdk/src/lib/swap/Swap.ts
+++ b/projects/sdk/src/lib/swap/Swap.ts
@@ -29,7 +29,6 @@ export class Swap {
   }
 
   public buildSwap(tokenIn: Token, tokenOut: Token, account: string, _from?: FarmFromMode, _to?: FarmToMode) {
-    
     const route = this.router.getRoute(tokenIn.symbol, tokenOut.symbol);
     const workflow = Swap.sdk.farm.createAdvancedFarm(`Swap ${tokenIn.symbol}->${tokenOut.symbol}`);
 
diff --git a/projects/sdk/src/lib/swap/SwapOperation.ts b/projects/sdk/src/lib/swap/SwapOperation.ts
index 54ac3128c7..9ce18412a3 100644
--- a/projects/sdk/src/lib/swap/SwapOperation.ts
+++ b/projects/sdk/src/lib/swap/SwapOperation.ts
@@ -4,7 +4,7 @@ import { TokenValue } from "src/TokenValue";
 import { Token } from "src/classes/Token";
 import { BeanstalkSDK } from "src/lib/BeanstalkSDK";
 import { Route } from "src/classes/Router";
-import { AdvancedFarmWorkflow } from "../farm";
+import { AdvancedFarmWorkflow, FarmFromMode, FarmToMode } from "../farm";
 
 type PathSegment = {
   from: string;
@@ -18,7 +18,7 @@ export class SwapOperation {
     sdk: BeanstalkSDK,
     readonly tokenIn: Token,
     readonly tokenOut: Token,
-    private readonly workflow: AdvancedFarmWorkflow|Workflow,
+    private readonly workflow: AdvancedFarmWorkflow | Workflow,
     private readonly route: Route
   ) {
     SwapOperation.sdk = sdk;
diff --git a/projects/ui/src/components/Chop/Actions/Chop.tsx b/projects/ui/src/components/Chop/Actions/Chop.tsx
index de9cdc3cef..061bed37cc 100644
--- a/projects/ui/src/components/Chop/Actions/Chop.tsx
+++ b/projects/ui/src/components/Chop/Actions/Chop.tsx
@@ -58,6 +58,7 @@ import TransactionToast from '~/components/Common/TxnToast';
 import useFormMiddleware from '~/hooks/ledger/useFormMiddleware';
 import useSdk from '~/hooks/sdk';
 import useBDV from '~/hooks/beanstalk/useBDV';
+import { BalanceFrom } from '~/components/Common/Form/BalanceFromRow';
 
 type ChopFormValues = FormState & {
   destination: FarmToMode | undefined;
@@ -76,7 +77,11 @@ const ChopForm: FC<
   const unripeUnderlying = useUnripeUnderlyingMap();
   const [quote, setQuote] = useState<BigNumber>(new BigNumber(0));
   const [quoteBdv, setQuoteBdv] = useState<BigNumber>(new BigNumber(0));
-
+  const [balanceFromIn, setBalanceFromIn] = useState<BalanceFrom>(
+    values.destination === FarmToMode.EXTERNAL
+      ? BalanceFrom.EXTERNAL
+      : BalanceFrom.INTERNAL
+  );
   /// Derived values
   const state = values.tokens[0];
   const inputToken = state.token;
@@ -147,6 +152,14 @@ const ChopForm: FC<
 
   const isSubmittable = quote?.gt(0) && values.destination;
 
+  const changeDestination = (v: BalanceFrom) => {
+    setBalanceFromIn(v);
+    setFieldValue(
+      'destination',
+      v === BalanceFrom.EXTERNAL ? FarmToMode.EXTERNAL : FarmToMode.INTERNAL
+    );
+  };
+
   return (
     <Form autoComplete="off">
       <TokenSelectDialog
@@ -157,6 +170,9 @@ const ChopForm: FC<
         balances={balances}
         tokenList={Object.values(erc20TokenMap)}
         mode={TokenSelectMode.SINGLE}
+        balanceFrom={balanceFromIn}
+        setBalanceFrom={changeDestination}
+        balanceFromOptions={[BalanceFrom.INTERNAL, BalanceFrom.EXTERNAL]}
       />
       <Stack gap={1}>
         <TokenInputField
@@ -167,7 +183,11 @@ const ChopForm: FC<
           fullWidth
           InputProps={{
             endAdornment: (
-              <TokenAdornment token={inputToken} onClick={showTokenSelect} />
+              <TokenAdornment
+                balanceFrom={balanceFromIn}
+                token={inputToken}
+                onClick={showTokenSelect}
+              />
             ),
           }}
         />
diff --git a/projects/ui/src/components/Common/Form/BalanceFromRow.tsx b/projects/ui/src/components/Common/Form/BalanceFromRow.tsx
index db11da6dc7..4da8c4134f 100644
--- a/projects/ui/src/components/Common/Form/BalanceFromRow.tsx
+++ b/projects/ui/src/components/Common/Form/BalanceFromRow.tsx
@@ -49,9 +49,10 @@ const options: BalanceFrom[] = [
 const BalanceFromRow: React.FC<{
   balanceFrom: BalanceFrom;
   setBalanceFrom: (v: BalanceFrom) => void;
-}> = ({ balanceFrom, setBalanceFrom }) => (
+  customOptions?: BalanceFrom[];
+}> = ({ balanceFrom, setBalanceFrom, customOptions }) => (
   <Row gap={1}>
-    {options.map((option) => {
+    {(customOptions || options).map((option) => {
       const isSelected = balanceFrom === option;
       return (
         <Button
diff --git a/projects/ui/src/components/Common/Form/TokenSelectDialog.tsx b/projects/ui/src/components/Common/Form/TokenSelectDialog.tsx
index 2e01d2fa17..9ac7b986de 100644
--- a/projects/ui/src/components/Common/Form/TokenSelectDialog.tsx
+++ b/projects/ui/src/components/Common/Form/TokenSelectDialog.tsx
@@ -55,6 +55,8 @@ export type TokenSelectDialogProps<K extends keyof TokenBalanceMode> = {
   description?: string | JSX.Element;
   /** the balance (circulating |farm | combined) being used */
   balanceFrom?: BalanceFrom;
+  /** custom set of options to filter the balance from selection */
+  balanceFromOptions?: BalanceFrom[];
   /** set the balance (circulating |farm | combined) to use */
   setBalanceFrom?: (v: BalanceFrom) => void;
   /**
@@ -92,6 +94,7 @@ const TokenSelectDialog: TokenSelectDialogC = React.memo(
     title,
     description,
     balanceFrom = BalanceFrom.TOTAL,
+    balanceFromOptions,
     setBalanceFrom,
     // Balances
     balancesType = 'farm',
@@ -210,6 +213,7 @@ const TokenSelectDialog: TokenSelectDialogC = React.memo(
               <BalanceFromRow
                 balanceFrom={balanceFrom}
                 setBalanceFrom={setBalanceFrom}
+                customOptions={balanceFromOptions}
               />
               <Box
                 pt={2}
diff --git a/projects/ui/src/components/Market/PodsV2/Actions/Buy/CreateOrder.tsx b/projects/ui/src/components/Market/PodsV2/Actions/Buy/CreateOrder.tsx
index cda1a59222..cd72f9ea27 100644
--- a/projects/ui/src/components/Market/PodsV2/Actions/Buy/CreateOrder.tsx
+++ b/projects/ui/src/components/Market/PodsV2/Actions/Buy/CreateOrder.tsx
@@ -56,6 +56,7 @@ import { QuoteHandlerWithParams } from '~/hooks/ledger/useQuoteWithParams';
 
 import FormTxnProvider from '~/components/Common/Form/FormTxnProvider';
 import useFormTxnContext from '~/hooks/sdk/useFormTxnContext';
+import { BalanceFrom } from '~/components/Common/Form/BalanceFromRow';
 
 export type CreateOrderFormValues = {
   placeInLine: BigNumber | null;
@@ -175,6 +176,7 @@ const CreateOrderV2Form: FC<
         selected={values.tokens}
         handleSubmit={handleSelectTokens}
         balances={balances}
+        balanceFrom={BalanceFrom.TOTAL}
         tokenList={Object.values(erc20TokenMap)}
         mode={TokenSelectMode.SINGLE}
       />
@@ -223,6 +225,7 @@ const CreateOrderV2Form: FC<
                     ? balances.eth
                     : balances[state.token.address] || ZERO_BN
                 }
+                balanceFrom={BalanceFrom.TOTAL}
                 state={state}
                 params={quoteHandlerParams}
                 showTokenSelect={handleOpen}
diff --git a/projects/ui/src/components/Market/PodsV2/Actions/Buy/FillListingForm.tsx b/projects/ui/src/components/Market/PodsV2/Actions/Buy/FillListingForm.tsx
index 42014cc7fe..f52bfa4ecc 100644
--- a/projects/ui/src/components/Market/PodsV2/Actions/Buy/FillListingForm.tsx
+++ b/projects/ui/src/components/Market/PodsV2/Actions/Buy/FillListingForm.tsx
@@ -47,6 +47,7 @@ import useFormMiddleware from '~/hooks/ledger/useFormMiddleware';
 import TokenOutput from '~/components/Common/Form/TokenOutput';
 import useSdk from '~/hooks/sdk';
 import useAccount from '~/hooks/ledger/useAccount';
+import { BalanceFrom } from '~/components/Common/Form/BalanceFromRow';
 
 export type FillListingFormValues = FormState & {
   settings: SlippageSettingsFragment;
@@ -197,6 +198,7 @@ const FillListingV2Form: FC<
         balances={balances}
         tokenList={Object.values(erc20TokenMap)}
         mode={TokenSelectMode.SINGLE}
+        balanceFrom={BalanceFrom.TOTAL}
       />
       <Stack gap={1}>
         <TokenQuoteProvider
@@ -212,6 +214,7 @@ const FillListingV2Form: FC<
           state={values.tokens[0]}
           showTokenSelect={handleOpen}
           handleQuote={handleQuote}
+          balanceFrom={BalanceFrom.TOTAL}
           size="small"
         />
         {isReady ? (
@@ -412,7 +415,8 @@ const FillListingForm: FC<{
           finalFromMode = optimizeFromMode(amountBeans, balances[Bean.address]);
           farm = sdk.farm.create();
           tokenInNew = sdk.tokens.BEAN; // FIXME
-        } else { /// Swap to BEAN and buy
+        } else {
+          /// Swap to BEAN and buy
           // Require a quote
           if (!formData.amountOut)
             throw new Error(`No quote available for ${formData.token.symbol}`);
@@ -497,7 +501,7 @@ const FillListingForm: FC<{
       balances,
       sdk,
       beanstalk.interface,
-      account
+      account,
     ]
   );
 
diff --git a/projects/ui/src/components/Swap/Actions/Swap.tsx b/projects/ui/src/components/Swap/Actions/Swap.tsx
index ab12bf4a73..6100576038 100644
--- a/projects/ui/src/components/Swap/Actions/Swap.tsx
+++ b/projects/ui/src/components/Swap/Actions/Swap.tsx
@@ -55,6 +55,8 @@ import Row from '~/components/Common/Row';
 import { FC } from '~/types';
 import useFormMiddleware from '~/hooks/ledger/useFormMiddleware';
 import useSdk from '~/hooks/sdk';
+import { BalanceFrom } from '~/components/Common/Form/BalanceFromRow';
+// import { Balance } from '@mui/icons-material';
 
 /// ---------------------------------------------------------------
 
@@ -113,6 +115,19 @@ const SwapForm: FC<
   const account = useAccount();
   const sdk = useSdk();
 
+  // This controls what options are show on the tokenin picker (All Balances, circulating, farm).
+  const [fromOptions, setFromOptions] = useState<BalanceFrom[]>([
+    BalanceFrom.TOTAL,
+  ]);
+  // This controls the actual value chosen for tokenIn
+  const [balanceFromIn, setBalanceFromIn] = useState<BalanceFrom>(
+    BalanceFrom.TOTAL
+  );
+  // This controls the actual value chosen for tokenOut
+  const [balanceFromOut, setBalanceFromOut] = useState<BalanceFrom>(
+    BalanceFrom.EXTERNAL
+  );
+
   /// Derived values
   const stateIn = values.tokensIn[0];
   const tokenIn = stateIn.token;
@@ -122,7 +137,6 @@ const SwapForm: FC<
   const tokenOut = stateOut.token;
   const modeOut = values.modeOut;
   const amountOut = stateOut.amount;
-
   const tokensMatch = tokenIn === tokenOut;
   const noBalancesFound = useMemo(
     () => Object.keys(balances).length === 0,
@@ -138,6 +152,22 @@ const SwapForm: FC<
     return [_balanceIn, _balanceIn, _balanceIn?.total || ZERO_BN] as const;
   }, [balances, modeIn, tokenIn.address, tokensMatch]);
 
+  // Control what balances are shown in the token selector (internal/external/total)
+  useEffect(() => {
+    // if tokens match, then we want to allow picking different balanceFrom options
+    if (tokensMatch) {
+      setFromOptions([BalanceFrom.INTERNAL, BalanceFrom.EXTERNAL]);
+      setBalanceFromIn(
+        modeIn === FarmFromMode.INTERNAL
+          ? BalanceFrom.INTERNAL
+          : BalanceFrom.EXTERNAL
+      );
+    } else {
+      setFromOptions([BalanceFrom.TOTAL]);
+      setBalanceFromIn(BalanceFrom.TOTAL);
+    }
+  }, [tokensMatch, modeIn, modeOut, setFieldValue]);
+
   const noBalance = !balanceInMax?.gt(0);
   const expectedFromMode = balanceIn
     ? optimizeFromMode(
@@ -199,10 +229,13 @@ const SwapForm: FC<
     [balanceIn, amountIn]
   );
 
-  const swapOperation = useMemo(
-    () => buildSwapHelper(tokenIn, tokenOut, optimizedFromMode, modeOut),
-    [buildSwapHelper, optimizedFromMode, tokenIn, tokenOut, modeOut]
-  );
+  const swapOperation = useMemo(() => {
+    // If we are swapping the same token (ie, transfering between farm and circulating)
+    // then we don't want to use the optimizedFromMode, we want to use the modeIn
+    // that the user selected.
+    const from = tokenIn.equals(tokenOut) ? modeIn : optimizedFromMode;
+    return buildSwapHelper(tokenIn, tokenOut, from, modeOut);
+  }, [buildSwapHelper, optimizedFromMode, tokenIn, tokenOut, modeIn, modeOut]);
 
   /// Memoize to prevent infinite loop on useQuote
   const handleBackward = useMemo(
@@ -229,6 +262,8 @@ const SwapForm: FC<
     setFieldValue('modeOut', defaultValues.modeOut);
     setFieldValue('tokensIn.0', { ...defaultValues.tokensIn[0] });
     setFieldValue('tokenOut', { ...defaultValues.tokenOut });
+    setBalanceFromIn(BalanceFrom.TOTAL);
+    setFromOptions([BalanceFrom.TOTAL]);
   }, [defaultValues, setFieldValue]);
 
   /// reset to default values when user switches wallet addresses or disconnects
@@ -248,11 +283,22 @@ const SwapForm: FC<
     setFieldValue('tokenOut.amount', resultOut?.amountOut);
   }, [setFieldValue, resultOut]);
 
-  const handleChangeModeIn = useCallback(
-    (v: FarmFromMode) => {
-      const newModeOut =
-        v === FarmFromMode.INTERNAL ? FarmToMode.EXTERNAL : FarmToMode.INTERNAL;
-      setFieldValue('modeOut', newModeOut);
+  //
+  const handleInputFromMode = useCallback(
+    (v: BalanceFrom) => {
+      console.log('change');
+      // Picked Farm balance
+      if (v === BalanceFrom.INTERNAL) {
+        setFieldValue('modeIn', FarmToMode.INTERNAL);
+        setFieldValue('modeOut', FarmToMode.EXTERNAL);
+        setBalanceFromOut(BalanceFrom.EXTERNAL);
+      }
+      // Picked Ciruclating
+      else if (v === BalanceFrom.EXTERNAL) {
+        setFieldValue('modeIn', FarmToMode.EXTERNAL);
+        setFieldValue('modeOut', FarmToMode.INTERNAL);
+        setBalanceFromOut(BalanceFrom.INTERNAL);
+      }
     },
     [setFieldValue]
   );
@@ -263,6 +309,9 @@ const SwapForm: FC<
           ? FarmFromMode.EXTERNAL
           : FarmFromMode.INTERNAL;
       setFieldValue('modeIn', newModeIn);
+      setBalanceFromOut(
+        v === FarmToMode.INTERNAL ? BalanceFrom.INTERNAL : BalanceFrom.EXTERNAL
+      );
     },
     [setFieldValue]
   );
@@ -317,12 +366,12 @@ const SwapForm: FC<
     /// If user has an INTERNAL balance of the selected token,
     /// or if they have no balance at all, always show INTERNAL->EXTERNAL.
     /// Otherwise show the reverse.
-    const [newModeIn, newModeOut] =
-      !balanceIn || balanceIn.internal.gt(0) || balanceIn.total.eq(0)
-        ? [FarmFromMode.INTERNAL, FarmToMode.EXTERNAL]
-        : [FarmFromMode.EXTERNAL, FarmToMode.INTERNAL];
-    setFieldValue('modeIn', newModeIn);
-    setFieldValue('modeOut', newModeOut);
+    if (modeIn.toString() === modeOut.toString()) {
+      setFieldValue('modeIn', FarmFromMode.EXTERNAL);
+      setFieldValue('modeOut', FarmFromMode.INTERNAL);
+      setBalanceFromOut(BalanceFrom.INTERNAL);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [balanceIn, setFieldValue]);
 
   const handleReverse = useCallback(() => {
@@ -412,16 +461,27 @@ const SwapForm: FC<
   return (
     <Form autoComplete="off" onSubmit={handleSubmitWrapper}>
       <TokenSelectDialog
-        title={
-          tokenSelect === 'tokensIn'
-            ? 'Select Input Token'
-            : 'Select Output Token'
-        }
-        open={tokenSelect !== null} // 'tokensIn' | 'tokensOut'
+        title="Select Input Token"
+        open={tokenSelect === 'tokensIn'} // only open for the TokenIn input
+        handleClose={handleCloseTokenSelect} //
+        handleSubmit={handleTokenSelectSubmit} //
+        selected={selectedTokens}
+        balances={balances}
+        balanceFrom={balanceFromIn}
+        setBalanceFrom={handleInputFromMode}
+        balanceFromOptions={fromOptions}
+        tokenList={tokenList}
+        mode={TokenSelectMode.SINGLE}
+      />
+      <TokenSelectDialog
+        title="Select Output Token"
+        open={tokenSelect === 'tokenOut'}
         handleClose={handleCloseTokenSelect} //
         handleSubmit={handleTokenSelectSubmit} //
         selected={selectedTokens}
         balances={balances}
+        balanceFrom={balanceFromOut}
+        balanceFromOptions={[BalanceFrom.EXTERNAL, BalanceFrom.INTERNAL]}
         tokenList={tokenList}
         mode={TokenSelectMode.SINGLE}
       />
@@ -436,6 +496,7 @@ const SwapForm: FC<
             InputProps={{
               endAdornment: (
                 <TokenAdornment
+                  balanceFrom={balanceFromIn}
                   token={tokenIn}
                   onClick={handleShowTokenSelect('tokensIn')}
                 />
@@ -457,14 +518,6 @@ const SwapForm: FC<
             onChange={handleChangeAmountIn}
             error={!noBalance && !enoughBalanceCheck}
           />
-          {tokensMatch ? (
-            <FarmModeField
-              name="modeIn"
-              label="Source"
-              baseMode={FarmFromMode}
-              onChange={handleChangeModeIn}
-            />
-          ) : null}
         </>
         <Row justifyContent="center" mt={-1}>
           <IconButton onClick={handleReverse} size="small">
@@ -482,6 +535,7 @@ const SwapForm: FC<
               endAdornment: (
                 <TokenAdornment
                   token={tokenOut}
+                  balanceFrom={balanceFromOut}
                   onClick={handleShowTokenSelect('tokenOut')}
                 />
               ),
@@ -520,9 +574,6 @@ const SwapForm: FC<
             </Link>
           </Alert>
         ) : null}
-        {/**
-         * After the upgrade to `handleChangeModeIn` / `handleChangeModeOut`
-         * this should never be true. */}
         {diffModeCheck === false ? (
           <Alert variant="standard" color="warning" icon={<WarningIcon />}>
             Please choose a different source or destination.
@@ -772,6 +823,7 @@ const Swap: FC<{}> = () => {
             (err as unknown as Error).message
           );
         }
+
         const txn = await values.swapOperation.execute(
           amountIn,
           values.settings.slippage,