diff --git a/app/Livewire/Security/CloudInitScriptForm.php b/app/Livewire/Security/CloudInitScriptForm.php
index 33beff3341..2479715573 100644
--- a/app/Livewire/Security/CloudInitScriptForm.php
+++ b/app/Livewire/Security/CloudInitScriptForm.php
@@ -87,7 +87,7 @@ public function save()
             $this->dispatch('success', $message);
 
             if ($this->modal_mode) {
-                $this->dispatch('closeModal');
+                $this->dispatch('close-modal');
             }
         } catch (\Throwable $e) {
             return handleError($e, $this);
diff --git a/resources/views/components/modal-input.blade.php b/resources/views/components/modal-input.blade.php
index bdc9d9ac7e..ca3499c697 100644
--- a/resources/views/components/modal-input.blade.php
+++ b/resources/views/components/modal-input.blade.php
@@ -14,7 +14,7 @@
     $modalId = 'modal-' . uniqid();
 @endphp
 
-<div x-data="{ modalOpen: false }"
+<div x-data="{ modalOpen: false }" x-on:close-modal.window="modalOpen = false"
     x-init="$watch('modalOpen', value => { if (!value) { $wire.dispatch('modalClosed') } })"
     :class="{ 'z-40': modalOpen }" @keydown.window.escape="modalOpen=false"
     class="relative w-auto h-auto" wire:ignore>
diff --git a/resources/views/livewire/security/cloud-init-script-form.blade.php b/resources/views/livewire/security/cloud-init-script-form.blade.php
index 83bedffab7..9a23534343 100644
--- a/resources/views/livewire/security/cloud-init-script-form.blade.php
+++ b/resources/views/livewire/security/cloud-init-script-form.blade.php
@@ -6,7 +6,7 @@
 
     <div class="flex justify-end gap-2">
         @if ($modal_mode)
-            <x-forms.button type="button" @click="$dispatch('closeModal')">
+            <x-forms.button type="button" @click="$dispatch('close-modal')">
                 Cancel
             </x-forms.button>
         @endif
@@ -14,4 +14,4 @@
             {{ $scriptId ? 'Update Script' : 'Create Script' }}
         </x-forms.button>
     </div>
-</form>
\ No newline at end of file
+</form>