diff --git a/frontend/src/app/components/OnboardingModal.tsx b/frontend/src/app/components/OnboardingModal.tsx
index 03fdf81a..145e8848 100644
--- a/frontend/src/app/components/OnboardingModal.tsx
+++ b/frontend/src/app/components/OnboardingModal.tsx
@@ -277,7 +277,7 @@ const OnboardingModal: React.FC = () => {
   if (!open) return null;
 
   return (
-    <Modal open={open} onClose={handleSkip} sx={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+    <Modal open={open} onClose={step === 'connect' ? handleSkip : undefined} sx={{ display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
       <Box sx={{
         width: 480, maxWidth: '90vw', bgcolor: c.bg.surface, borderRadius: `${c.radius.xl}px`,
         border: `1px solid ${c.border.subtle}`, p: 3.5, outline: 'none',
@@ -373,13 +373,6 @@ const OnboardingModal: React.FC = () => {
             >
               Continue
             </Button>
-            <Button
-              onClick={() => setStep('connect')}
-              fullWidth
-              sx={{ textTransform: 'none', fontSize: '0.72rem', color: c.text.ghost, '&:hover': { bgcolor: 'transparent', color: c.text.muted } }}
-            >
-              Skip
-            </Button>
           </>
         ) : (
           <>
diff --git a/frontend/src/app/components/OnboardingWalkthrough.tsx b/frontend/src/app/components/OnboardingWalkthrough.tsx
index 407839bf..7857e773 100644
--- a/frontend/src/app/components/OnboardingWalkthrough.tsx
+++ b/frontend/src/app/components/OnboardingWalkthrough.tsx
@@ -370,22 +370,7 @@ const OnboardingWalkthrough: React.FC<Props> = ({ onComplete }) => {
         )}
 
         {/* Buttons */}
-        <Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
-          <Button
-            onClick={handleSkip}
-            sx={{
-              textTransform: 'none',
-              fontSize: '0.72rem',
-              color: c.text.muted,
-              fontFamily: c.font.sans,
-              minWidth: 'auto',
-              px: 1,
-              '&:hover': { bgcolor: 'transparent', color: c.text.secondary },
-            }}
-          >
-            Skip tour
-          </Button>
-
+        <Box sx={{ display: 'flex', justifyContent: 'flex-end', alignItems: 'center' }}>
           <Button
             onClick={handleNext}
             sx={{
@@ -401,7 +386,7 @@ const OnboardingWalkthrough: React.FC<Props> = ({ onComplete }) => {
               '&:hover': { bgcolor: c.accent.hover || c.accent.primary },
             }}
           >
-            {isLastStep ? 'Get Started' : step.actionHint ? 'or Skip step' : 'Next'}
+            {isLastStep ? 'Get Started' : 'Next'}
           </Button>
         </Box>
       </Box>