diff --git a/app/Events/ServerPatchCheckFinished.php b/app/Events/ServerPatchCheckFinished.php
index c9d8cb269e..c66b0740c0 100644
--- a/app/Events/ServerPatchCheckFinished.php
+++ b/app/Events/ServerPatchCheckFinished.php
@@ -17,11 +17,6 @@ class ServerPatchCheckFinished implements ShouldBroadcast
         $this->teamId = $teamId;
     }
 
-    public function broadcastAs(): string
-    {
-        return 'ServerPatchCheckFinished';
-    }
-
     /**
      * @return array{serverUuid: string|null}
      */
diff --git a/app/Events/ServerValidated.php b/app/Events/ServerValidated.php
index 8a7631f777..6a64bad3cd 100644
--- a/app/Events/ServerValidated.php
+++ b/app/Events/ServerValidated.php
@@ -20,11 +20,6 @@ class ServerValidated implements ShouldBroadcast
         $this->serverUuid = $serverUuid;
     }
 
-    public function broadcastAs(): string
-    {
-        return 'ServerValidated';
-    }
-
     public function broadcastWith(): array
     {
         return [
diff --git a/app/Livewire/Server/Show.php b/app/Livewire/Server/Show.php
index 695a7a8180..ccb2b86eb4 100644
--- a/app/Livewire/Server/Show.php
+++ b/app/Livewire/Server/Show.php
@@ -741,10 +741,15 @@ class Show extends Component
         // Refresh server data and only the display-only state that validation produces.
         // Never re-sync text-input properties via syncData() — would clobber any
         // unsaved typing (see coolify#6062 / #6354 / #9695).
+        $wasValidating = $this->isValidating;
         $this->server->refresh();
         $this->server->settings->refresh();
         $this->isValidating = $this->server->is_validating ?? false;
         $this->validationLogs = $this->server->validation_logs;
+        if ($wasValidating && ! $this->isValidating) {
+            // The dialog was opened for a background validation job, which does not drive its checkpoints.
+            $this->dispatch('background-validation-finished');
+        }
         $this->isReachable = $this->server->settings->is_reachable;
         $this->isUsable = $this->server->settings->is_usable;
 
diff --git a/resources/views/livewire/server/show.blade.php b/resources/views/livewire/server/show.blade.php
index 96387be41d..9149d505bf 100644
--- a/resources/views/livewire/server/show.blade.php
+++ b/resources/views/livewire/server/show.blade.php
@@ -143,7 +143,8 @@
                             @endif
 
                             @if ($server->canBeValidated())
-                                <x-process-dialog closeWithX mobileFullscreen size="xl" :open="$isValidating">
+                                <x-process-dialog closeWithX mobileFullscreen size="xl" :open="$isValidating"
+                                    x-on:background-validation-finished.window="processDialogOpen = false">
                                     <x-slot:title>Validate and configure</x-slot:title>
                                     <x-slot:content>
                                         <livewire:server.validate-and-install :server="$server"