diff --git a/packages/standard-components/src/DataGrid/Component.svelte b/packages/standard-components/src/DataGrid/Component.svelte
index 9e0e1699aa..ca9208d465 100644
--- a/packages/standard-components/src/DataGrid/Component.svelte
+++ b/packages/standard-components/src/DataGrid/Component.svelte
@@ -57,13 +57,11 @@
     return false
   }
 
-  const handleSubmit = e => {
-    // Send off data here and update to display in grid component
-    console.log("Submitting:", e.detail)
+  const handleNewRecord = async () => {
+    data = await fetchData(datasource)
   }
 
   const handleUpdate = ({ detail }) => {
-    console.log(detail)
     data[detail.row] = detail.data
     updateRecord(detail.data)
   }
@@ -74,11 +72,9 @@
       record
     )
     const json = await response.json()
-    console.log(json)
   }
 
   const deleteRecords = async () => {
-    console.log(_bb.api)
     const response = await _bb.api.post(`/api/${datasource.name}/records`, {
       records: selectedRows,
       type: "delete",
@@ -91,7 +87,7 @@
 <div class="container">
   {#if dataLoaded}
     <div class="controls">
-      <CreateRowButton {_bb} {model} />
+      <CreateRowButton {_bb} {model} on:newRecord={handleNewRecord} />
       {#if selectedRows.length > 0}
         <DeleteButton text small on:click={deleteRecords}>
           <Icon name="addrow" />
diff --git a/packages/standard-components/src/DataGrid/CreateRow/Button.svelte b/packages/standard-components/src/DataGrid/CreateRow/Button.svelte
index c3ce02c3f4..81b5d63750 100644
--- a/packages/standard-components/src/DataGrid/CreateRow/Button.svelte
+++ b/packages/standard-components/src/DataGrid/CreateRow/Button.svelte
@@ -1,7 +1,10 @@
 <script>
+  import { createEventDispatcher } from "svelte"
   import { DropdownMenu, TextButton as Button, Icon } from "@budibase/bbui"
   import Modal from "./Modal.svelte"
 
+  const dispatch = createEventDispatcher()
+
   let anchor
   let dropdown
 
@@ -16,7 +19,11 @@
 </div>
 <DropdownMenu bind:this={dropdown} {anchor} align="left">
   <h5>Add New Row</h5>
-  <Modal {_bb} {model} onClosed={dropdown.hide} />
+  <Modal
+    {_bb}
+    {model}
+    onClosed={dropdown.hide}
+    on:newRecord={() => dispatch('newRecord')} />
 </DropdownMenu>
 
 <style>
diff --git a/packages/standard-components/src/DataGrid/CreateRow/Modal.svelte b/packages/standard-components/src/DataGrid/CreateRow/Modal.svelte
index c8b90736e4..686c5f0906 100644
--- a/packages/standard-components/src/DataGrid/CreateRow/Modal.svelte
+++ b/packages/standard-components/src/DataGrid/CreateRow/Modal.svelte
@@ -1,9 +1,10 @@
 <script>
-  import { onMount } from "svelte"
+  import { onMount, createEventDispatcher } from "svelte"
   import { fade } from "svelte/transition"
   import { Button, Label, DatePicker } from "@budibase/bbui"
   import Dropzone from "../../attachments/Dropzone.svelte"
   import debounce from "lodash.debounce"
+  const dispatch = createEventDispatcher()
 
   const DEFAULTS_FOR_TYPE = {
     string: "",
@@ -43,8 +44,6 @@
 
     const json = await response.json()
 
-    console.log(json)
-
     if (response.status === 200) {
       store.update(state => {
         state[model._id] = state[model._id]
@@ -60,6 +59,7 @@
       record = isNew ? { modelId: model._id } : json
 
       onClosed()
+      dispatch("newRecord")
     }
 
     if (response.status === 400) {