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 69df7948f9c..6017b744017 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
@@ -25,6 +25,7 @@
                         href: solidus_admin.send("order_#{@type}_address_path", @order, address_id: address.id),
                         class: 'block text-black text-sm hover:bg-gray-50 p-2 mx-2 w-auto rounded-lg',
                         'data-action': "#{stimulus_id}#close",
+                        'data-turbo-frame': address_frame_id
                       ) do %>
                     <%= format_address(address) %>
                   <% end %>
@@ -35,7 +36,9 @@
         </div>
 
         <div class="w-full flex gap-4">
-          <%= render component('ui/forms/address').new(address: @address, name: "order[#{@type}_address_attributes]") %>
+          <%= turbo_frame_tag address_frame_id do %>
+            <%= render component('ui/forms/address').new(address: @address, name: "order[#{@type}_address_attributes]") %>
+          <% end %>
         </div>
 
         <label class="flex gap-2 items-center">
diff --git a/admin/app/components/solidus_admin/orders/show/address/component.rb b/admin/app/components/solidus_admin/orders/show/address/component.rb
index e0e347337de..4ab9208ebf5 100644
--- a/admin/app/components/solidus_admin/orders/show/address/component.rb
+++ b/admin/app/components/solidus_admin/orders/show/address/component.rb
@@ -16,6 +16,10 @@ def form_id
     @form_id ||= "#{stimulus_id}--form-#{@type}-#{@order.id}"
   end
 
+  def address_frame_id
+    @table_frame_id ||= "#{stimulus_id}--#{@type}-address-frame-#{@order.id}"
+  end
+
   def use_attribute
     case @type
     when 'ship'