diff --git a/admin/app/components/solidus_admin/orders/show/address/component.html.erb b/admin/app/components/solidus_admin/orders/show/address/component.html.erb
index bca9503c1ba..695307b4767 100644
--- a/admin/app/components/solidus_admin/orders/show/address/component.html.erb
+++ b/admin/app/components/solidus_admin/orders/show/address/component.html.erb
@@ -10,7 +10,7 @@
           </h2>
 
           <% if @user&.addresses&.any? %>
-            <details class="text-black text-sm" data-<%= stimulus_id %>-target="addresses">
+            <details data-controller="details" data-<%= stimulus_id %>-target="addresses" class="text-black text-sm">
               <summary
                 class="text-left flex cursor-pointer select-none"
                 data-action="keydown.esc-><%= stimulus_id %>#close"
diff --git a/admin/app/javascript/solidus_admin/controllers/details_controller.js b/admin/app/javascript/solidus_admin/controllers/details_controller.js
new file mode 100644
index 00000000000..d237f2f2953
--- /dev/null
+++ b/admin/app/javascript/solidus_admin/controllers/details_controller.js
@@ -0,0 +1,12 @@
+import { Controller } from '@hotwired/stimulus'
+import { useClickOutside } from 'stimulus-use'
+
+export default class extends Controller {
+  connect() {
+    useClickOutside(this)
+  }
+
+  clickOutside(event) {
+    this.element.removeAttribute('open')
+  }
+}