diff --git a/resources/scripts/components/dashboard/forms/ConfigureTwoFactorForm.tsx b/resources/scripts/components/dashboard/forms/ConfigureTwoFactorForm.tsx
index aadd388ee..dc6b467a6 100644
--- a/resources/scripts/components/dashboard/forms/ConfigureTwoFactorForm.tsx
+++ b/resources/scripts/components/dashboard/forms/ConfigureTwoFactorForm.tsx
@@ -10,7 +10,13 @@ export default () => {
 
     return user.useTotp ?
         <div>
-            {visible && <DisableTwoFactorModal visible={visible} onDismissed={() => setVisible(false)}/>}
+            {visible &&
+            <DisableTwoFactorModal
+                appear={true}
+                visible={visible}
+                onDismissed={() => setVisible(false)}
+            />
+            }
             <p className={'text-sm'}>
                 Two-factor authentication is currently enabled on your account.
             </p>
@@ -25,7 +31,13 @@ export default () => {
         </div>
         :
         <div>
-            {visible && <SetupTwoFactorModal visible={visible} onDismissed={() => setVisible(false)}/>}
+            {visible &&
+            <SetupTwoFactorModal
+                appear={true}
+                visible={visible}
+                onDismissed={() => setVisible(false)}
+            />
+            }
             <p className={'text-sm'}>
                 You do not currently have two-factor authentication enabled on your account. Click
                 the button below to begin configuring it.
diff --git a/resources/scripts/components/dashboard/forms/SetupTwoFactorModal.tsx b/resources/scripts/components/dashboard/forms/SetupTwoFactorModal.tsx
index 5a9439ad5..01e6f0c88 100644
--- a/resources/scripts/components/dashboard/forms/SetupTwoFactorModal.tsx
+++ b/resources/scripts/components/dashboard/forms/SetupTwoFactorModal.tsx
@@ -63,9 +63,9 @@ export default ({ ...props }: RequiredModalProps) => {
                 >
                     <Form className={'mb-0'}>
                         <FlashMessageRender className={'mb-6'} byKey={'account:two-factor'}/>
-                        <div className={'flex'}>
-                            <div className={'flex-1'}>
-                                <div className={'w-64 h-64 bg-neutral-600 p-2 rounded'}>
+                        <div className={'flex flex-wrap'}>
+                            <div className={'w-full md:flex-1'}>
+                                <div className={'w-32 h-32 md:w-64 md:w-64 bg-neutral-600 p-2 rounded mx-auto'}>
                                     {!token || !token.length ?
                                         <img
                                             src={'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII='}
@@ -80,7 +80,7 @@ export default ({ ...props }: RequiredModalProps) => {
                                     }
                                 </div>
                             </div>
-                            <div className={'flex-1 flex flex-col'}>
+                            <div className={'w-full mt-6 md:mt-0 md:flex-1 md:flex md:flex-col'}>
                                 <div className={'flex-1'}>
                                     <Field
                                         id={'code'}
@@ -91,7 +91,7 @@ export default ({ ...props }: RequiredModalProps) => {
                                         autoFocus={!loading}
                                     />
                                 </div>
-                                <div className={'text-right'}>
+                                <div className={'mt-6 md:mt-0 text-right'}>
                                     <button className={'btn btn-primary btn-sm'} disabled={!isValid}>
                                         Setup
                                     </button>
diff --git a/resources/scripts/components/elements/Modal.tsx b/resources/scripts/components/elements/Modal.tsx
index 195495dfe..075b5f01a 100644
--- a/resources/scripts/components/elements/Modal.tsx
+++ b/resources/scripts/components/elements/Modal.tsx
@@ -7,6 +7,7 @@ import Spinner from '@/components/elements/Spinner';
 export interface RequiredModalProps {
     visible: boolean;
     onDismissed: () => void;
+    appear?: boolean;
 }
 
 type Props = RequiredModalProps & {
@@ -38,6 +39,7 @@ export default (props: Props) => {
         <CSSTransition
             timeout={250}
             classNames={'fade'}
+            appear={props.appear}
             in={render}
             unmountOnExit={true}
             onExited={() => props.onDismissed()}