diff --git a/apps/client/src/ee/base/components/grid/add-row-button.tsx b/apps/client/src/ee/base/components/grid/add-row-button.tsx
index 0131ecde1..f0838148b 100644
--- a/apps/client/src/ee/base/components/grid/add-row-button.tsx
+++ b/apps/client/src/ee/base/components/grid/add-row-button.tsx
@@ -16,6 +16,12 @@ export const AddRowButton = memo(function AddRowButton({
     <div
       className={classes.addRowButton}
       onClick={onClick}
+      onKeyDown={(e) => {
+        if (e.key === "Enter" || e.key === " ") {
+          e.preventDefault();
+          onClick?.();
+        }
+      }}
       role="button"
       tabIndex={0}
     >
diff --git a/apps/client/src/ee/base/hooks/use-grid-keyboard-nav.ts b/apps/client/src/ee/base/hooks/use-grid-keyboard-nav.ts
index 9d09d79dc..f8bad8af1 100644
--- a/apps/client/src/ee/base/hooks/use-grid-keyboard-nav.ts
+++ b/apps/client/src/ee/base/hooks/use-grid-keyboard-nav.ts
@@ -166,6 +166,8 @@ export function useGridKeyboardNav({
         return;
       }
 
+      if (e.target !== containerRef.current) return;
+
       if (isTextEntry(document.activeElement)) return;
 
       if (e.key === "Escape") {
@@ -263,6 +265,7 @@ export function useGridKeyboardNav({
       }
     },
     [
+      containerRef,
       editingCell,
       focusedCell,
       getRowIds,