diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php
index 7e606459b..fb306e092 100644
--- a/app/Livewire/Project/Application/General.php
+++ b/app/Livewire/Project/Application/General.php
@@ -482,18 +482,18 @@ public function instantSave()
             $oldPortsExposes = $this->application->ports_exposes;
             $oldIsContainerLabelEscapeEnabled = $this->application->settings->is_container_label_escape_enabled;
             $oldIsPreserveRepositoryEnabled = $this->application->settings->is_preserve_repository_enabled;
+            $oldIsSpa = $this->application->settings->is_spa;
+            $oldIsHttpBasicAuthEnabled = $this->application->is_http_basic_auth_enabled;
 
             $this->syncData(toModel: true);
 
-            if ($this->application->settings->isDirty('is_spa')) {
-                $this->generateNginxConfiguration($this->application->settings->is_spa ? 'spa' : 'static');
+            if ($oldIsSpa !== $this->isSpa) {
+                $this->generateNginxConfiguration($this->isSpa ? 'spa' : 'static');
             }
-            if ($this->application->isDirty('is_http_basic_auth_enabled')) {
+            if ($oldIsHttpBasicAuthEnabled !== $this->isHttpBasicAuthEnabled) {
                 $this->application->save();
             }
 
-            $this->application->settings->save();
-
             $this->dispatch('success', 'Settings saved.');
             $this->application->refresh();
 
diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php
index 2484005ef..bfec17dc6 100644
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/resources/views/livewire/project/application/general.blade.php
@@ -70,9 +70,13 @@
                     placeholder="Empty means default configuration will be used." label="Custom Nginx Configuration"
                     helper="You can add custom Nginx configuration here." x-bind:disabled="!canUpdate" />
                 @can('update', $application)
-                    <x-forms.button wire:click="generateNginxConfiguration">
-                        Generate Default Nginx Configuration
-                    </x-forms.button>
+                    <x-modal-confirmation title="Confirm Nginx Configuration Generation?"
+                        buttonTitle="Generate Default Nginx Configuration" buttonFullWidth
+                        submitAction="generateNginxConfiguration('{{ $application->settings->is_spa ? 'spa' : 'static' }}')"
+                        :actions="[
+                            'This will overwrite your current custom Nginx configuration.',
+                            'The default configuration will be generated based on your application type (' . ($application->settings->is_spa ? 'SPA' : 'static') . ').',
+                        ]" />
                 @endcan
             @endif
             <div class="w-96 pb-6">