diff --git a/frontend/src/lib/components/DropdownV2.svelte b/frontend/src/lib/components/DropdownV2.svelte
index e5f4f579e8..c6e1fbc46b 100644
--- a/frontend/src/lib/components/DropdownV2.svelte
+++ b/frontend/src/lib/components/DropdownV2.svelte
@@ -84,7 +84,11 @@
 <TriggerableByAI id={aiId} description={aiDescription} onTrigger={() => buttonEl.click()}>
 	<button
 		bind:this={buttonEl}
-		class={twMerge('w-full flex items-center justify-end', fixedHeight && 'h-8', $$props.class)}
+		class={twMerge(
+			'w-full flex items-center justify-end h-full',
+			fixedHeight && 'h-8',
+			$$props.class
+		)}
 		use:melt={$trigger}
 		{disabled}
 		on:click={(e) => e.stopPropagation()}
diff --git a/frontend/src/lib/components/TriggerableByAI.svelte b/frontend/src/lib/components/TriggerableByAI.svelte
index f8aa6dbbcb..71e8765fa8 100644
--- a/frontend/src/lib/components/TriggerableByAI.svelte
+++ b/frontend/src/lib/components/TriggerableByAI.svelte
@@ -46,23 +46,31 @@
 	})
 </script>
 
-<div class="ai-triggerable-wrapper">
-	{#if isAnimating}
-		<div class="ai-triggerable-animation"></div>
-	{/if}
-	<div class="ai-triggerable-content">
-		{@render children?.()}
+{#if disabled}
+	{@render children?.()}
+{/if}
+
+{#if !disabled}
+	<div class="ai-triggerable-wrapper">
+		{#if isAnimating}
+			<div class="ai-triggerable-animation"></div>
+		{/if}
+		<div class="ai-triggerable-content">
+			{@render children?.()}
+		</div>
 	</div>
-</div>
+{/if}
 
 <style>
 	.ai-triggerable-wrapper {
 		position: relative;
+		height: 100%;
 	}
 
 	.ai-triggerable-content {
 		/* This preserves original styling of children */
-		display: contents;
+		/* display: contents; */
+		height: 100%;
 	}
 
 	.ai-triggerable-animation {