diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 6120290d0d..536992d655 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -64,10 +64,11 @@ jobs:
       - run: yarn --frozen-lockfile
 
       # Run build all the projects
-      - name: Build
-        run: |
-          yarn build:oss
-          yarn build:account-portal
+      - name: Build OSS
+        run: yarn build:oss
+      - name: Build account portal
+        run: yarn build:account-portal
+        if: inputs.run_as_oss != true
       # Check the types of the projects built via esbuild
       - name: Check types
         run: |
diff --git a/lerna.json b/lerna.json
index 385d86209a..78a3aa13e9 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.23.3",
+  "version": "2.23.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*",
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte
index 7e9c113a77..6b27d79c15 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte
@@ -137,8 +137,12 @@
     const activeTag = document.activeElement?.tagName.toLowerCase()
     const inCodeEditor =
       document.activeElement?.classList?.contains("cm-content")
+    const inPosthogSurvey =
+      document.activeElement?.classList?.[0]?.startsWith("PostHogSurvey")
     if (
-      (inCodeEditor || ["input", "textarea"].indexOf(activeTag) !== -1) &&
+      (inCodeEditor ||
+        inPosthogSurvey ||
+        ["input", "textarea"].indexOf(activeTag) !== -1) &&
       e.key !== "Escape"
     ) {
       return