diff --git a/modules/backend/formwidgets/repeater/assets/css/repeater.css b/modules/backend/formwidgets/repeater/assets/css/repeater.css
index c01f4d61c..83d80d0fc 100644
--- a/modules/backend/formwidgets/repeater/assets/css/repeater.css
+++ b/modules/backend/formwidgets/repeater/assets/css/repeater.css
@@ -13,7 +13,7 @@
   padding-top: 15px;
   padding-right: 15px;
   z-index: 2000;
-  background-color: #ffffff;
+  background-color: #f9f9f9;
   border: 1px dashed #dbdee0;
 }
 .field-repeater ul.field-repeater-items > li.dragged .repeater-item-remove {
@@ -64,6 +64,14 @@
   position: relative;
   top: -7px;
 }
+.field-repeater li.field-repeater-item .field-repeater-form:before,
+.field-repeater li.field-repeater-item .field-repeater-form:after {
+  content: " ";
+  display: table;
+}
+.field-repeater li.field-repeater-item .field-repeater-form:after {
+  clear: both;
+}
 .field-repeater li.field-repeater-item .repeater-item-handle {
   position: absolute;
   top: -6px;
diff --git a/modules/backend/formwidgets/repeater/assets/less/repeater.less b/modules/backend/formwidgets/repeater/assets/less/repeater.less
index 3771e4374..5be2689d9 100644
--- a/modules/backend/formwidgets/repeater/assets/less/repeater.less
+++ b/modules/backend/formwidgets/repeater/assets/less/repeater.less
@@ -61,6 +61,7 @@
         .field-repeater-form {
             position: relative;
             top: -7px;
+            .clearfix;
         }
 
         .repeater-item-handle {
diff --git a/modules/backend/formwidgets/repeater/partials/_repeater_item.htm b/modules/backend/formwidgets/repeater/partials/_repeater_item.htm
index f0756618a..1729a3303 100644
--- a/modules/backend/formwidgets/repeater/partials/_repeater_item.htm
+++ b/modules/backend/formwidgets/repeater/partials/_repeater_item.htm
@@ -18,9 +18,9 @@
     </div>
 
     <div class="field-repeater-form">
-        <?= $widget->render([
-            'useContainer' => false
-        ]) ?>
+        <?php foreach ($widget->getFields() as $field): ?>
+            <?= $widget->renderField($field) ?>
+        <?php endforeach ?>
     </div>
 
     <input type="hidden" name="<?= $indexName ?>" value="<?= $indexValue ?>" />