diff --git a/src/features/ui/components/modal-root.tsx b/src/features/ui/components/modal-root.tsx
index 890ad9c08..b7d27472d 100644
--- a/src/features/ui/components/modal-root.tsx
+++ b/src/features/ui/components/modal-root.tsx
@@ -46,6 +46,7 @@ import {
   ZapSplitModal,
   ZapInvoiceModal,
   ZapsModal,
+  CaptchaModal,
 } from 'soapbox/features/ui/util/async-components';
 
 import ModalLoading from './modal-loading';
@@ -56,6 +57,7 @@ const MODAL_COMPONENTS: Record<string, React.ExoticComponent<any>> = {
   'ACTIONS': ActionsModal,
   'BIRTHDAYS': BirthdaysModal,
   'BOOST': BoostModal,
+  'CAPTCHA': CaptchaModal,
   'COMPARE_HISTORY': CompareHistoryModal,
   'COMPONENT': ComponentModal,
   'COMPOSE': ComposeModal,
diff --git a/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx b/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx
index f4692f05b..b923c8aaf 100644
--- a/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx
+++ b/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx
@@ -3,8 +3,8 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import { fetchAccount } from 'soapbox/actions/accounts';
+import { openModal } from 'soapbox/actions/modals';
 import { logInNostr } from 'soapbox/actions/nostr';
-import { startOnboarding } from 'soapbox/actions/onboarding';
 import CopyableInput from 'soapbox/components/copyable-input';
 import EmojiGraphic from 'soapbox/components/emoji-graphic';
 import { Button, Stack, Modal, FormGroup, Text, Tooltip, HStack } from 'soapbox/components/ui';
@@ -62,9 +62,9 @@ const KeygenStep: React.FC<IKeygenStep> = ({ onClose }) => {
     await Promise.all(events.map((event) => relay?.event(event)));
 
     await dispatch(logInNostr(pubkey));
-    dispatch(startOnboarding());
 
     onClose();
+    await dispatch(openModal('CAPTCHA'));
   };
 
   return (
@@ -82,7 +82,6 @@ const KeygenStep: React.FC<IKeygenStep> = ({ onClose }) => {
           </Text>
         </Stack>
 
-
         <HStack space={6} justifyContent='center' >
           <Button theme='secondary' size='lg' icon={require('@tabler/icons/outline/download.svg')} onClick={handleDownload}>
             <FormattedMessage id='nostr_signup.keygen.download_key_button' defaultMessage='Download key' />
diff --git a/src/features/ui/util/async-components.ts b/src/features/ui/util/async-components.ts
index 25adf38c4..91af34395 100644
--- a/src/features/ui/util/async-components.ts
+++ b/src/features/ui/util/async-components.ts
@@ -180,3 +180,4 @@ export const ZapPayRequestModal = lazy(() => import('soapbox/features/ui/compone
 export const ZapInvoiceModal = lazy(() => import('soapbox/features/ui/components/modals/zap-invoice'));
 export const ZapsModal = lazy(() => import('soapbox/features/ui/components/modals/zaps-modal'));
 export const ZapSplitModal = lazy(() => import('soapbox/features/ui/components/modals/zap-split/zap-split-modal'));
+export const CaptchaModal = lazy(() => import('soapbox/features/ui/components/modals/captcha-modal/captcha-modal'));