diff --git a/src/components/renderer/form-loop.vue b/src/components/renderer/form-loop.vue
index 70444c0a3..12d48ead6 100644
--- a/src/components/renderer/form-loop.vue
+++ b/src/components/renderer/form-loop.vue
@@ -1,15 +1,17 @@
 <template>
   <div class="form-group">
     <div v-for="loopIndex in times" :key="loopIndex">
-      <vue-form-renderer
-        @submit="submit"
-        :data="getMatrixValue(loopIndex)"
-        @update="setMatrixValue(loopIndex, $event)"
-        :config="rendererConfig"
-        :computed="null"
-        :custom-css="null"
-        :watchers="null"
+      <form>
+        <vue-form-renderer
+          @submit="submit"
+          :data="getMatrixValue(loopIndex)"
+          @update="setMatrixValue(loopIndex, $event)"
+          :config="rendererConfig"
+          :computed="null"
+          :custom-css="null"
+          :watchers="null"
         />
+      </form>
     </div>
   </div>
 </template>
@@ -36,6 +38,12 @@ export default {
       }];
     },
     times() {
+      // If there is existing data, set the length to what ever it is
+      const itemsFromData = _.get(this.transientData, this.name, null);
+      if (Array.isArray(itemsFromData)) {
+        return [...itemsFromData.keys()];
+      }
+
       if (!this.config) {
         return [];
       }
diff --git a/src/form-builder-controls.js b/src/form-builder-controls.js
index 386802da5..7237085c1 100644
--- a/src/form-builder-controls.js
+++ b/src/form-builder-controls.js
@@ -371,8 +371,8 @@ export default [
           type: 'FormInput',
           field: 'times',
           config: {
-            label: 'Number of times',
-            helper: 'Enter the number of times to repeat the element(s)',
+            label: 'Default Number Of Times',
+            helper: 'Enter the number of times to repeat if the data does not exist.',
           },
         },
       ],