diff --git a/packages/frontend-core/src/components/grid/controls/DeleteButton.svelte b/packages/frontend-core/src/components/grid/controls/DeleteButton.svelte
index 53e0c46883..8ca5f0920d 100644
--- a/packages/frontend-core/src/components/grid/controls/DeleteButton.svelte
+++ b/packages/frontend-core/src/components/grid/controls/DeleteButton.svelte
@@ -1,8 +1,8 @@
 <script>
   import { Modal, ModalContent, Button, notifications } from "@budibase/bbui"
-  import { getContext } from "svelte"
+  import { getContext, onMount } from "svelte"
 
-  const { selectedRows, rows, config } = getContext("grid")
+  const { selectedRows, rows, config, subscribe } = getContext("grid")
 
   let modal
 
@@ -23,6 +23,8 @@
     await rows.actions.deleteRows(rowsToDelete)
     notifications.success(`Deleted ${count} row${count === 1 ? "" : "s"}`)
   }
+
+  onMount(() => subscribe("request-bulk-delete", () => modal?.show()))
 </script>
 
 {#if selectedRowCount}
diff --git a/packages/frontend-core/src/components/grid/layout/NewRowTop.svelte b/packages/frontend-core/src/components/grid/layout/NewRowTop.svelte
index 8643ca6911..4abbf41d24 100644
--- a/packages/frontend-core/src/components/grid/layout/NewRowTop.svelte
+++ b/packages/frontend-core/src/components/grid/layout/NewRowTop.svelte
@@ -6,6 +6,7 @@
   import DataCell from "../cells/DataCell.svelte"
   import { fade } from "svelte/transition"
   import { GutterWidth } from "../lib/constants"
+  import { NewRowID } from "../lib/constants"
 
   const {
     hoveredRowId,
@@ -21,10 +22,8 @@
     renderedColumns,
   } = getContext("grid")
 
-  const rowId = "new"
   let isAdding = false
   let newRow = {}
-  let touched = false
 
   $: firstColumn = $stickyColumn || $renderedColumns[0]
   $: width = GutterWidth + ($stickyColumn?.width || 0)
@@ -66,19 +65,18 @@
     document.addEventListener("keydown", handleKeyPress)
     newRow = {}
     isAdding = true
-    $hoveredRowId = rowId
+    $hoveredRowId = NewRowID
     if (firstColumn) {
-      $focusedCellId = `${rowId}-${firstColumn.name}`
+      $focusedCellId = `${NewRowID}-${firstColumn.name}`
     }
   }
 
   const updateValue = (rowId, columnName, val) => {
-    touched = true
     newRow[columnName] = val
   }
 
   const addViaModal = () => {
-    isAdding = false
+    clear()
     dispatch("add-row")
   }
 
diff --git a/packages/frontend-core/src/components/grid/lib/constants.js b/packages/frontend-core/src/components/grid/lib/constants.js
index e5427106a7..2d059343c1 100644
--- a/packages/frontend-core/src/components/grid/lib/constants.js
+++ b/packages/frontend-core/src/components/grid/lib/constants.js
@@ -9,3 +9,4 @@ export const SmallRowHeight = 36
 export const MediumRowHeight = 64
 export const LargeRowHeight = 92
 export const DefaultRowHeight = SmallRowHeight
+export const NewRowID = "new"
diff --git a/packages/frontend-core/src/components/grid/lib/events.js b/packages/frontend-core/src/components/grid/lib/events.js
index 1c486858b2..950ed70332 100644
--- a/packages/frontend-core/src/components/grid/lib/events.js
+++ b/packages/frontend-core/src/components/grid/lib/events.js
@@ -21,7 +21,10 @@ export const createEventManagers = () => {
 
     // Return unsubscribe function
     return () => {
+      console.log("unsub", event)
+      console.log(subscribers[event].length)
       subscribers[event] = subscribers[event].filter(cb => cb !== callback)
+      console.log(subscribers[event].length)
     }
   }
 
diff --git a/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte b/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte
index 4da5cd2c0d..eb034edf2d 100644
--- a/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte
+++ b/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte
@@ -1,6 +1,7 @@
 <script>
   import { getContext, onMount } from "svelte"
   import { debounce } from "../../../utils/utils"
+  import { NewRowID } from "../lib/constants"
 
   const {
     enrichedRows,
@@ -11,6 +12,7 @@
     focusedCellAPI,
     clipboard,
     dispatch,
+    selectedRows,
   } = getContext("grid")
 
   // Global key listener which intercepts all key events
@@ -34,9 +36,11 @@
       // which depend on being able to read cell state on an escape keypress
       // get a chance to observe the true state before we blur
       setTimeout(api?.blur, 10)
+      return
     } else if (e.key === "Tab") {
       api?.blur?.()
       changeFocusedColumn(1)
+      return
     }
 
     // Pass the key event to the selected cell and let it decide whether to
@@ -84,11 +88,19 @@
           break
         case "Delete":
         case "Backspace":
-          deleteSelectedCell()
+          if (Object.keys($selectedRows).length) {
+            dispatch("request-bulk-delete")
+          } else {
+            deleteSelectedCell()
+          }
           break
         case "Enter":
           focusCell()
           break
+        case " ":
+        case "Space":
+          toggleSelectRow()
+          break
         default:
           startEnteringValue(e.key, e.which)
       }
@@ -182,6 +194,17 @@
     }
   }
 
+  const toggleSelectRow = () => {
+    const id = $focusedRow?._id
+    if (!id || id === NewRowID) {
+      return
+    }
+    selectedRows.update(state => {
+      state[id] = !state[id]
+      return state
+    })
+  }
+
   onMount(() => {
     document.addEventListener("keydown", handleKeyDown)
     return () => {
diff --git a/packages/frontend-core/src/components/grid/stores/rows.js b/packages/frontend-core/src/components/grid/stores/rows.js
index 30e0fad96a..7b4a9efdbc 100644
--- a/packages/frontend-core/src/components/grid/stores/rows.js
+++ b/packages/frontend-core/src/components/grid/stores/rows.js
@@ -1,6 +1,7 @@
 import { writable, derived, get } from "svelte/store"
 import { fetchData } from "../../../fetch/fetchData"
 import { notifications } from "@budibase/bbui"
+import { NewRowID } from "../lib/constants"
 
 const initialSortState = {
   column: null,
@@ -230,7 +231,7 @@ export const deriveStores = context => {
       if (bubble) {
         throw error
       } else {
-        handleValidationError("new", error)
+        handleValidationError(NewRowID, error)
       }
     }
   }
diff --git a/packages/frontend-core/src/components/grid/stores/ui.js b/packages/frontend-core/src/components/grid/stores/ui.js
index 48cb382dbb..da5b370177 100644
--- a/packages/frontend-core/src/components/grid/stores/ui.js
+++ b/packages/frontend-core/src/components/grid/stores/ui.js
@@ -4,6 +4,7 @@ import {
   DefaultRowHeight,
   LargeRowHeight,
   MediumRowHeight,
+  NewRowID,
 } from "../lib/constants"
 
 export const createStores = () => {
@@ -50,9 +51,9 @@ export const deriveStores = context => {
     ([$focusedCellId, $rowLookupMap, $enrichedRows]) => {
       const rowId = $focusedCellId?.split("-")[0]
 
-      // Edge case for new rows (top and bottom row ID components have unique IDs)
-      if (rowId?.startsWith("new")) {
-        return { _id: rowId }
+      // Edge case for new rows
+      if (rowId === NewRowID) {
+        return { _id: NewRowID }
       }
 
       // All normal rows
@@ -145,18 +146,18 @@ export const initialise = context => {
   })
 
   // Reset selected rows when selected cell changes
-  focusedCellId.subscribe(id => {
-    if (id) {
-      selectedRows.set({})
-    }
-  })
+  // focusedCellId.subscribe(id => {
+  //   if (id) {
+  //     selectedRows.set({})
+  //   }
+  // })
 
   // Unset selected cell when rows are selected
-  selectedRows.subscribe(rows => {
-    if (Object.keys(rows || {}).length) {
-      focusedCellId.set(null)
-    }
-  })
+  // selectedRows.subscribe(rows => {
+  //   if (Object.keys(rows || {}).length) {
+  //     focusedCellId.set(null)
+  //   }
+  // })
 
   // Remove hovered row when a cell is selected
   focusedCellId.subscribe(cell => {