diff --git a/resources/views/components/notification/event-multiselect.blade.php b/resources/views/components/notification/event-multiselect.blade.php
index 0eeaa08fc..986fcabec 100644
--- a/resources/views/components/notification/event-multiselect.blade.php
+++ b/resources/views/components/notification/event-multiselect.blade.php
@@ -34,7 +34,14 @@ class="shrink-0 rounded-full bg-neutral-100 px-1.5 py-0.5 text-[10px] font-mediu
             </svg>
         </button>
 
-        <div class="listbox-panel" x-show="open" x-cloak role="listbox" aria-multiselectable="true">
+        <div class="listbox-panel" x-show="open" x-cloak
+            x-transition:enter="transition ease-out duration-100"
+            x-transition:enter-start="opacity-0 -translate-y-1 scale-[0.98]"
+            x-transition:enter-end="opacity-100 translate-y-0 scale-100"
+            x-transition:leave="transition ease-in duration-75"
+            x-transition:leave-start="opacity-100 translate-y-0 scale-100"
+            x-transition:leave-end="opacity-0 -translate-y-1 scale-[0.98]"
+            role="listbox" aria-multiselectable="true">
             @foreach ($events as $event)
                 <button wire:key="{{ $id }}-{{ $event['property'] }}" type="button" class="listbox-option"
                     role="option" aria-selected="{{ $event['enabled'] ? 'true' : 'false' }}"
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 02f6ecf1a..a97d8c1df 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -95,7 +95,7 @@
 </head>
 @section('body')
 
-<body class="dark:text-inherit text-black">
+<body class="overflow-y-scroll dark:text-inherit text-black">
     <x-toast />
     <x-icon-tooltip />
     <script data-navigate-once>
diff --git a/resources/views/v5/app.blade.php b/resources/views/v5/app.blade.php
index 7a4afe13f..751e54d3c 100644
--- a/resources/views/v5/app.blade.php
+++ b/resources/views/v5/app.blade.php
@@ -63,7 +63,7 @@
     <x-inertia::head />
 </head>
 
-<body>
+<body class="overflow-y-scroll">
     <x-inertia::app id="v5-app" />
 </body>
 
diff --git a/tests/Feature/ListboxTriggerTruncationTest.php b/tests/Feature/ListboxTriggerTruncationTest.php
index 666283edb..b4b503b9e 100644
--- a/tests/Feature/ListboxTriggerTruncationTest.php
+++ b/tests/Feature/ListboxTriggerTruncationTest.php
@@ -132,3 +132,21 @@
         ->toContain('title="Docker cleanup failure, Disk usage warning, Server unreachable, Server patching"')
         ->toContain('4/4');
 });
+
+test('notification event multiselect uses the same panel animation as listboxes', function () {
+    $html = Blade::render(<<<'BLADE'
+        <x-notification.event-multiselect id="deployment-email-events" label="Deployments" :events="[
+            ['property' => 'deploymentSuccessEmailNotifications', 'label' => 'Deployment success', 'enabled' => false],
+            ['property' => 'deploymentFailureEmailNotifications', 'label' => 'Deployment failure', 'enabled' => true],
+            ['property' => 'statusChangeEmailNotifications', 'label' => 'Container status changes', 'enabled' => false],
+        ]" />
+    BLADE);
+
+    expect($html)
+        ->toContain('x-transition:enter="transition ease-out duration-100"')
+        ->toContain('x-transition:enter-start="opacity-0 -translate-y-1 scale-[0.98]"')
+        ->toContain('x-transition:enter-end="opacity-100 translate-y-0 scale-100"')
+        ->toContain('x-transition:leave="transition ease-in duration-75"')
+        ->toContain('x-transition:leave-start="opacity-100 translate-y-0 scale-100"')
+        ->toContain('x-transition:leave-end="opacity-0 -translate-y-1 scale-[0.98]"');
+});
diff --git a/tests/Unit/BodyScrollbarLayoutTest.php b/tests/Unit/BodyScrollbarLayoutTest.php
new file mode 100644
index 000000000..cb7f4ac9e
--- /dev/null
+++ b/tests/Unit/BodyScrollbarLayoutTest.php
@@ -0,0 +1,10 @@
+<?php
+
+test('app layouts always reserve space for the vertical scrollbar', function (string $layout) {
+    $contents = file_get_contents(dirname(__DIR__, 2).'/'.$layout);
+
+    expect($contents)->toMatch('/<body(?:\s+[^>]*)?class="[^"]*overflow-y-scroll[^"]*"[^>]*>/');
+})->with([
+    'current interface' => 'resources/views/layouts/base.blade.php',
+    'v5 interface' => 'resources/views/v5/app.blade.php',
+]);
