diff --git a/src/lib/components/admin/Functions.svelte b/src/lib/components/admin/Functions.svelte
index 33735ab220..16e40d5c2b 100644
--- a/src/lib/components/admin/Functions.svelte
+++ b/src/lib/components/admin/Functions.svelte
@@ -704,9 +704,9 @@
 											</button>
 										</FunctionMenu>
 
-										<button
+										<div
 											class="flex h-6 items-center"
-											type="button"
+											role="presentation"
 											on:click={(e) => {
 												e.stopPropagation();
 												e.preventDefault();
@@ -715,6 +715,7 @@
 											<Tooltip content={func.is_active ? $i18n.t('Enabled') : $i18n.t('Disabled')}>
 												<Switch
 													bind:state={func.is_active}
+													ariaLabel={$i18n.t('Enabled')}
 													on:change={async () => {
 														toggleFunctionById(localStorage.token, func.id);
 														models.set(
@@ -729,7 +730,7 @@
 													}}
 												/>
 											</Tooltip>
-										</button>
+										</div>
 									{/if}
 								</div>
 							</div>
diff --git a/src/lib/components/workspace/Skills.svelte b/src/lib/components/workspace/Skills.svelte
index 674e497a2e..7cfc193ae9 100644
--- a/src/lib/components/workspace/Skills.svelte
+++ b/src/lib/components/workspace/Skills.svelte
@@ -643,9 +643,9 @@
 												</button>
 											</SkillMenu>
 
-											<button
+											<div
 												class="flex h-6 items-center"
-												type="button"
+												role="presentation"
 												on:click={(e) => {
 													e.stopPropagation();
 													e.preventDefault();
@@ -656,13 +656,14 @@
 												>
 													<Switch
 														bind:state={skill.is_active}
+														ariaLabel={$i18n.t('Enabled')}
 														on:change={async () => {
 															await toggleSkillById(localStorage.token, skill.id);
 															_skills.set(await getSkills(localStorage.token));
 														}}
 													/>
 												</Tooltip>
-											</button>
+											</div>
 										</div>
 									{/if}
 								</div>
diff --git a/src/routes/(app)/automations/+page.svelte b/src/routes/(app)/automations/+page.svelte
index 4e8c747c0b..b0660a09cc 100644
--- a/src/routes/(app)/automations/+page.svelte
+++ b/src/routes/(app)/automations/+page.svelte
@@ -653,9 +653,9 @@
 											</button>
 										</AutomationMenu>
 
-										<button
+										<div
 											class="flex h-6 items-center"
-											type="button"
+											role="presentation"
 											on:click={(e) => {
 												e.stopPropagation();
 												e.preventDefault();
@@ -666,12 +666,13 @@
 											>
 												<Switch
 													bind:state={automation.is_active}
+													ariaLabel={$i18n.t('Enabled')}
 													on:change={() => {
 														toggleHandler(automation);
 													}}
 												/>
 											</Tooltip>
-										</button>
+										</div>
 									</div>
 								{/if}
 							</div>