diff --git a/ui/admin/app/components/form/host/aws/index.hbs b/ui/admin/app/components/form/host/aws/index.hbs
index 1ceea8ff7..7ca35ec66 100644
--- a/ui/admin/app/components/form/host/aws/index.hbs
+++ b/ui/admin/app/components/form/host/aws/index.hbs
@@ -72,18 +72,20 @@
     </:body>
   </form.fieldset>
 
-  {{#each @model.ip_addresses as |ip_address|}}
-    <form.fieldset>
-      <:title>{{t 'titles.ip-addresses'}}</:title>
-      <:body>
+  <form.fieldset>
+    <:title>{{t 'titles.ip-addresses'}}</:title>
+    <:body>
+      {{#each @model.ip_addresses as |ip_address|}}
+
         <form.input
           @value={{ip_address}}
           readonly={{true}}
           @disabled={{true}}
         />
-      </:body>
-    </form.fieldset>
-  {{/each}}
+      {{/each}}
+    </:body>
+  </form.fieldset>
+
   {{#if (can 'save model' @model)}}
     <form.actions
       @disabled={{if @model.cannotSave @model.cannotSave}}