diff --git a/app/Livewire/Project/Service/EditDomain.php b/app/Livewire/Project/Service/EditDomain.php
index 96fe6a62c3..580189103e 100644
--- a/app/Livewire/Project/Service/EditDomain.php
+++ b/app/Livewire/Project/Service/EditDomain.php
@@ -154,6 +154,7 @@ public function submit()
             $this->dispatch('refresh');
             $this->dispatch('refreshServices');
             $this->dispatch('configurationChanged');
+            $this->dispatch('close-modal');
         } catch (\Throwable $e) {
             $originalFqdn = $this->application->getOriginal('fqdn');
             if ($originalFqdn !== $this->application->fqdn) {
diff --git a/database/factories/ServiceApplicationFactory.php b/database/factories/ServiceApplicationFactory.php
new file mode 100644
index 0000000000..1b3f259fe7
--- /dev/null
+++ b/database/factories/ServiceApplicationFactory.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class ServiceApplicationFactory extends Factory
+{
+    public function definition(): array
+    {
+        return [
+            'name' => fake()->unique()->word(),
+            'service_id' => 1,
+        ];
+    }
+}
diff --git a/tests/Feature/Service/EditDomainPortValidationTest.php b/tests/Feature/Service/EditDomainPortValidationTest.php
index 1ac409e082..1e07e226db 100644
--- a/tests/Feature/Service/EditDomainPortValidationTest.php
+++ b/tests/Feature/Service/EditDomainPortValidationTest.php
@@ -2,6 +2,7 @@
 
 use App\Livewire\Project\Service\EditDomain;
 use App\Models\Environment;
+use App\Models\InstanceSettings;
 use App\Models\Project;
 use App\Models\Server;
 use App\Models\Service;
@@ -9,24 +10,31 @@
 use App\Models\StandaloneDocker;
 use App\Models\Team;
 use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Livewire\Livewire;
 
+uses(RefreshDatabase::class);
+
 beforeEach(function () {
+    // Required base instance settings (id 0)
+    $instanceSettings = new InstanceSettings;
+    $instanceSettings->id = 0;
+    $instanceSettings->save();
+
     // Create user and team
     $this->user = User::factory()->create();
     $this->team = Team::factory()->create();
     $this->user->teams()->attach($this->team, ['role' => 'owner']);
     $this->actingAs($this->user);
+    session(['currentTeam' => ['id' => $this->team->id]]);
 
     // Create server
     $this->server = Server::factory()->create([
         'team_id' => $this->team->id,
     ]);
 
-    // Create standalone docker destination
-    $this->destination = StandaloneDocker::factory()->create([
-        'server_id' => $this->server->id,
-    ]);
+    // Use the standalone docker destination auto-created with the server
+    $this->destination = StandaloneDocker::where('server_id', $this->server->id)->firstOrFail();
 
     // Create project and environment
     $this->project = Project::factory()->create([
@@ -132,6 +140,32 @@ function get_service_templates_mock()
         ->assertSet('showPortWarningModal', true);
 });
 
+it('closes the modal after successfully saving domains', function () {
+    Livewire::test(EditDomain::class, ['applicationId' => $this->serviceApplication->id])
+        ->set('fqdn', 'http://example.com:3000') // Valid domain with a port
+        ->call('submit')
+        ->assertSet('showPortWarningModal', false)
+        ->assertDispatched('close-modal');
+});
+
+it('does not close the modal while the port warning is shown', function () {
+    Livewire::test(EditDomain::class, ['applicationId' => $this->serviceApplication->id])
+        ->set('fqdn', 'http://example.com') // Remove port -> triggers warning, early return
+        ->call('submit')
+        ->assertSet('showPortWarningModal', true)
+        ->assertNotDispatched('close-modal');
+});
+
+it('closes the modal after confirming port removal', function () {
+    Livewire::test(EditDomain::class, ['applicationId' => $this->serviceApplication->id])
+        ->set('fqdn', 'http://example.com') // Remove port
+        ->call('submit')
+        ->assertSet('showPortWarningModal', true)
+        ->call('confirmRemovePort')
+        ->assertSet('showPortWarningModal', false)
+        ->assertDispatched('close-modal');
+});
+
 it('does not show warning for services without required port', function () {
     // Create a service without required port (e.g., cloudflared)
     $serviceWithoutPort = Service::factory()->create([