diff --git a/packages/ui/src/components/suggestions/main-suggestion.tsx b/packages/ui/src/components/suggestions/main-suggestion.tsx
index 097ab196..4f046d64 100644
--- a/packages/ui/src/components/suggestions/main-suggestion.tsx
+++ b/packages/ui/src/components/suggestions/main-suggestion.tsx
@@ -21,6 +21,7 @@ export interface MainSuggestionProps {
 	descriptionSize: Derivable<UDim2>;
 	badgeSize: Derivable<UDim2>;
 	errorSize: Derivable<UDim2>;
+	action?: (instance: Frame) => void;
 }
 
 export function MainSuggestion({
@@ -31,11 +32,13 @@ export function MainSuggestion({
 	descriptionSize,
 	badgeSize,
 	errorSize,
+	action,
 }: MainSuggestionProps) {
 	const options = useAtom(interfaceOptions);
 
 	return (
 		<Frame
+			action={action}
 			size={size}
 			backgroundColor={() => options().palette.background}
 			backgroundTransparency={() => options().backgroundTransparency ?? 0}
diff --git a/packages/ui/src/components/suggestions/suggestions.tsx b/packages/ui/src/components/suggestions/suggestions.tsx
index 88ae7a73..9f85f914 100644
--- a/packages/ui/src/components/suggestions/suggestions.tsx
+++ b/packages/ui/src/components/suggestions/suggestions.tsx
@@ -1,5 +1,5 @@
 import { TextService } from "@rbxts/services";
-import Vide, { cleanup, derive, spring } from "@rbxts/vide";
+import Vide, { cleanup, derive, source, spring } from "@rbxts/vide";
 import {
 	SUGGESTION_TEXT_SIZE,
 	SUGGESTION_TITLE_TEXT_SIZE,
@@ -17,13 +17,18 @@ import { MainSuggestion } from "./main-suggestion";
 import { SuggestionList } from "./suggestion-list";
 
 const MAX_SUGGESTION_WIDTH = 180;
-const MAX_BADGE_WIDTH = 80;
 const PADDING = 8;
 
 export function Suggestions() {
 	const options = useAtom(interfaceOptions);
 	const textPart = useAtom(currentTextPart);
 	const suggestion = useAtom(currentSuggestion);
+	const suggestionRef = source<Frame>();
+
+	const offset = (boundsState: () => Vector2) => () => {
+		const bounds = boundsState();
+		return new UDim2(0, bounds.X, 0, bounds.Y);
+	};
 
 	const titleBounds = useTextBounds({
 		text: () => suggestion()?.title,
@@ -93,37 +98,23 @@ export function Suggestions() {
 
 		const padding = px(PADDING * 2);
 		if (width === 0 || height === 0) {
-			return UDim2.fromOffset(0, px(SUGGESTION_TITLE_TEXT_SIZE) + padding);
+			return UDim2.fromOffset(0, suggestionRef()?.AbsoluteSize.Y ?? 0);
 		}
 
 		return UDim2.fromOffset(width + padding, height + padding);
 	});
 
 	return (
-		<Group
-			size={UDim2.fromScale(1, 1)}
-			visible={currentSuggestion !== undefined}
-		>
+		<Group size={UDim2.fromScale(1, 1)}>
 			<MainSuggestion
 				suggestion={suggestion}
 				currentText={textPart}
 				size={spring(windowSize, 0.2)}
-				titleSize={() => {
-					const bounds = titleBounds();
-					return UDim2.fromOffset(bounds.X, bounds.Y);
-				}}
-				descriptionSize={() => {
-					const bounds = descriptionBounds();
-					return UDim2.fromOffset(bounds.X, bounds.Y);
-				}}
-				badgeSize={() => {
-					const bounds = typeBadgeBounds();
-					return UDim2.fromOffset(bounds.X, bounds.Y);
-				}}
-				errorSize={() => {
-					const bounds = errorBounds();
-					return UDim2.fromOffset(bounds.X, bounds.Y);
-				}}
+				titleSize={offset(titleBounds)}
+				descriptionSize={offset(descriptionBounds)}
+				badgeSize={offset(typeBadgeBounds)}
+				errorSize={offset(errorBounds)}
+				action={suggestionRef}
 			/>
 
 			<SuggestionList