diff --git a/apps/frontend/src/components/QuoteRefreshProgress/index.tsx b/apps/frontend/src/components/QuoteRefreshProgress/index.tsx
index 5b962c78d..fe9dae378 100644
--- a/apps/frontend/src/components/QuoteRefreshProgress/index.tsx
+++ b/apps/frontend/src/components/QuoteRefreshProgress/index.tsx
@@ -40,7 +40,7 @@ export function QuoteRefreshProgress() {
     <div className="flex items-center justify-center gap-1">
       <div className="relative inline-block">
         <div
-          className="tooltip tooltip-bottom tooltip-primary relative flex items-center justify-center"
+          className="tooltip tooltip-bottom tooltip-primary relative flex items-center justify-center tabular-nums"
           data-tip={`Quote will update in ${timeRemaining}s`}
         >
           <svg className="-rotate-90 transform" height={radius * 2} width={radius * 2}>
diff --git a/apps/frontend/src/components/TokenSelection/TokenSelectionList/hooks/useTokenSelection.tsx b/apps/frontend/src/components/TokenSelection/TokenSelectionList/hooks/useTokenSelection.tsx
index 75b1be479..7393d9845 100644
--- a/apps/frontend/src/components/TokenSelection/TokenSelectionList/hooks/useTokenSelection.tsx
+++ b/apps/frontend/src/components/TokenSelection/TokenSelectionList/hooks/useTokenSelection.tsx
@@ -35,10 +35,6 @@ export const useTokenSelection = () => {
       return;
     }
 
-    if (!isFiatToken) {
-      await setSelectedNetwork(tokenDefinition.network);
-    }
-
     if (rampDirection === RampDirection.BUY) {
       if (tokenSelectModalType === "from") {
         setFiatToken(token as FiatToken);
@@ -52,6 +48,11 @@ export const useTokenSelection = () => {
         setFiatToken(token as FiatToken);
       }
     }
+
+    if (!isFiatToken) {
+      await setSelectedNetwork(tokenDefinition.network);
+    }
+
     closeTokenSelectModal();
   };