diff --git a/frontend/src/lib/components/common/table/AgentRow.svelte b/frontend/src/lib/components/common/table/AgentRow.svelte
index 2cbcb69ce6..d2b51fc661 100644
--- a/frontend/src/lib/components/common/table/AgentRow.svelte
+++ b/frontend/src/lib/components/common/table/AgentRow.svelte
@@ -93,7 +93,7 @@
 			<span class="hidden md:inline-flex">
 				<Button
 					variant="accent"
-					wrapperClasses="w-16 invisible group-hover/row:visible group-focus-within/row:visible"
+					wrapperClasses="w-16 invisible group-hover/row:visible group-focus-within/row:visible group-data-[row-keyboard-selected=true]/row:visible"
 					startIcon={{ icon: Pen }}
 					unifiedSize="sm"
 					href={editHref}
diff --git a/frontend/src/lib/components/common/table/AppRow.svelte b/frontend/src/lib/components/common/table/AppRow.svelte
index fd8c92f49e..df7d348915 100644
--- a/frontend/src/lib/components/common/table/AppRow.svelte
+++ b/frontend/src/lib/components/common/table/AppRow.svelte
@@ -171,7 +171,7 @@
 							aiId={`edit-app-button-${app.summary?.length > 0 ? app.summary : app.path}`}
 							aiDescription={`Edits the app ${app.summary?.length > 0 ? app.summary : app.path}`}
 							variant="accent"
-							wrapperClasses="w-16 invisible group-hover/row:visible group-focus-within/row:visible"
+							wrapperClasses="w-16 invisible group-hover/row:visible group-focus-within/row:visible group-data-[row-keyboard-selected=true]/row:visible"
 							unifiedSize="sm"
 							startIcon={{ icon: Pen }}
 							href="{base}/apps{app.raw_app ? '_raw' : ''}/edit/{app.path}"
diff --git a/frontend/src/lib/components/common/table/FlowRow.svelte b/frontend/src/lib/components/common/table/FlowRow.svelte
index 512894b4f0..c8201a7665 100644
--- a/frontend/src/lib/components/common/table/FlowRow.svelte
+++ b/frontend/src/lib/components/common/table/FlowRow.svelte
@@ -202,7 +202,7 @@
 				<div>
 					<Button
 						variant="accent"
-						wrapperClasses="w-16 invisible group-hover/row:visible group-focus-within/row:visible"
+						wrapperClasses="w-16 invisible group-hover/row:visible group-focus-within/row:visible group-data-[row-keyboard-selected=true]/row:visible"
 						startIcon={{ icon: Pen }}
 						unifiedSize="sm"
 						href="{base}/flows/edit/{flow.path}"
diff --git a/frontend/src/lib/components/common/table/ScriptRow.svelte b/frontend/src/lib/components/common/table/ScriptRow.svelte
index 5b98141e9c..1f6972f948 100644
--- a/frontend/src/lib/components/common/table/ScriptRow.svelte
+++ b/frontend/src/lib/components/common/table/ScriptRow.svelte
@@ -266,7 +266,7 @@
 								aiId={`edit-script-button-${script.summary?.length > 0 ? script.summary : script.path}`}
 								aiDescription={`Edits the script ${script.summary?.length > 0 ? script.summary : script.path}`}
 								variant="accent"
-								wrapperClasses="w-16 invisible group-hover/row:visible group-focus-within/row:visible"
+								wrapperClasses="w-16 invisible group-hover/row:visible group-focus-within/row:visible group-data-[row-keyboard-selected=true]/row:visible"
 								startIcon={{ icon: Pen }}
 								unifiedSize="sm"
 								href="{base}/scripts/edit/{script.path}"