diff --git a/resources/views/components/modal.blade.php b/resources/views/components/modal.blade.php
index ffb01c44..f77b271d 100644
--- a/resources/views/components/modal.blade.php
+++ b/resources/views/components/modal.blade.php
@@ -78,18 +78,19 @@
         @endif
 
         <div @class(['min-h-0 flex-1', 'max-sm:overflow-y-auto max-sm:px-6 max-sm:pb-6' => $fullscreen])>
-            @if (filled($title) || $icon)
-                <div @class(['mb-4', 'max-sm:hidden' => $fullscreen && ! $icon, 'text-center' => $icon])>
+            @if (filled($title) || filled($subtitle) || $icon)
+                {{-- A full-screen dialog's bar names it on a phone, so only the subtitle stays there. --}}
+                <div @class(['mb-4', 'max-sm:hidden' => $fullscreen && ! $icon && blank($subtitle), 'text-center' => $icon])>
                     @if ($icon)
                         <x-livewire-material::icon :name="$icon" class="mx-auto mb-4 size-6 text-secondary" />
                     @endif
 
                     @if (filled($title))
-                        <h2 id="{{ $id }}-title" class="type-headline-sm">{{ $title }}</h2>
+                        <h2 id="{{ $id }}-title" @class(['type-headline-sm', 'max-sm:hidden' => $fullscreen && ! $icon])>{{ $title }}</h2>
                     @endif
 
                     @if (filled($subtitle))
-                        <p class="mt-4 type-body-md text-on-surface-variant">{{ $subtitle }}</p>
+                        <p @class(['type-body-md text-on-surface-variant', 'mt-4' => filled($title) || $icon, 'max-sm:mt-0' => $fullscreen && ! $icon])>{{ $subtitle }}</p>
                     @endif
 
                     @if ($separator)
diff --git a/tests/Feature/Components/OverlayTest.php b/tests/Feature/Components/OverlayTest.php
index 124f610f..1539a211 100644
--- a/tests/Feature/Components/OverlayTest.php
+++ b/tests/Feature/Components/OverlayTest.php
@@ -44,6 +44,17 @@ it('uses the surrounding Alpine scope without wire:model, and stays open when pe
         ->toContain('aria-label="Close"');
 });
 
+it('keeps a full-screen dialog\'s subtitle on a phone, where its bar carries the title', function () {
+    $html = (string) $this->blade('<x-modal title="Enable 2FA" subtitle="Scan the code" fullscreen>Text</x-modal>');
+
+    expect($html)
+        ->toMatch('/<h2 id="[^"]+-title" class="type-headline-sm max-sm:hidden">/')
+        ->toContain('<p class="type-body-md text-on-surface-variant mt-4 max-sm:mt-0">Scan the code</p>')
+        ->not->toContain('<div class="mb-4 max-sm:hidden">')
+        ->and((string) $this->blade('<x-modal title="Help" fullscreen>Text</x-modal>'))->toContain('<div class="mb-4 max-sm:hidden">')
+        ->and((string) $this->blade('<x-modal subtitle="Only a subtitle">Text</x-modal>'))->toContain('<p class="type-body-md text-on-surface-variant">Only a subtitle</p>');
+});
+
 it('slides a side sheet in from either edge, and is a pane from xl when asked', function () {
     expect((string) $this->blade('<x-drawer title="Details" with-close-button>Body</x-drawer>'))
         ->toContain('x-trap.inert.noscroll="open && ! wide"')