From e006cad2cf31d18c2804ce3c7dbdde5ce5f06946 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Thu, 25 Aug 2022 09:35:57 +0100
Subject: [PATCH] Ensure the correct component is selected before executing
 component dropdown menu actions

---
 .../_components/navigation/ComponentDropdownMenu.svelte  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentDropdownMenu.svelte
index faa8b9d552..5add1fedac 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentDropdownMenu.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/navigation/ComponentDropdownMenu.svelte
@@ -2,9 +2,18 @@
   import { store } from "builderStore"
   import { ActionMenu, MenuItem, Icon } from "@budibase/bbui"
 
+  export let component
+
   $: noPaste = !$store.componentToPaste
 
   const keyboardEvent = (key, ctrlKey = false) => {
+    // Ensure this component is selected first
+    if (component._id !== $store.selectedComponentId) {
+      store.update(state => {
+        state.selectedComponentId = component._id
+        return state
+      })
+    }
     document.dispatchEvent(new KeyboardEvent("keydown", { key, ctrlKey }))
   }
 </script>