diff --git a/packages/builder/src/components/common/NavHeader.svelte b/packages/builder/src/components/common/NavHeader.svelte
index 3131f06ea6..5e401cf3c8 100644
--- a/packages/builder/src/components/common/NavHeader.svelte
+++ b/packages/builder/src/components/common/NavHeader.svelte
@@ -1,6 +1,7 @@
 <script>
   import { tick } from "svelte"
   import { Icon, Body } from "@budibase/bbui"
+  import { keyUtils } from "helpers/keyUtils"
 
   export let title
   export let placeholder
@@ -50,11 +51,21 @@
   <div class="title" class:hide={search}>
     <Body size="S">{title}</Body>
   </div>
-  <div on:click={openSearch} class="searchButton" class:hide={search}>
+  <div
+    on:click={openSearch}
+    on:keydown={keyUtils.handleEnter(openSearch)}
+    class="searchButton"
+    class:hide={search}
+  >
     <Icon size="S" name="Search" />
   </div>
 
-  <div on:click={handleAddButton} class="addButton" class:rotate={search}>
+  <div
+    on:click={handleAddButton}
+    on:keydown={keyUtils.handleEnter(handleAddButton)}
+    class="addButton"
+    class:rotate={search}
+  >
     <Icon name="Add" />
   </div>
 </div>
diff --git a/packages/builder/src/helpers/keyUtils.js b/packages/builder/src/helpers/keyUtils.js
new file mode 100644
index 0000000000..8d6dfb06dc
--- /dev/null
+++ b/packages/builder/src/helpers/keyUtils.js
@@ -0,0 +1,7 @@
+function handleEnter(fnc) {
+  return e => e.key === "Enter" && fnc()
+}
+
+export const keyUtils = {
+  handleEnter,
+}
