diff --git a/apps/web/src/components/features/input/BusterChatInput/BusterChatInputBase.tsx b/apps/web/src/components/features/input/BusterChatInput/BusterChatInputBase.tsx
index 37504fb9c..e2048d8b8 100644
--- a/apps/web/src/components/features/input/BusterChatInput/BusterChatInputBase.tsx
+++ b/apps/web/src/components/features/input/BusterChatInput/BusterChatInputBase.tsx
@@ -11,6 +11,7 @@ import type {
   MentionSuggestionExtension,
 } from '@/components/ui/inputs/MentionInput';
 import type {
+  MentionInputSuggestionsOnSelectParams,
   MentionInputSuggestionsProps,
   MentionInputSuggestionsRef,
 } from '@/components/ui/inputs/MentionInputSuggestions';
@@ -107,8 +108,10 @@ export const BusterChatInputBase: React.FC<BusterChatInputProps> = React.memo(
       onSubmit({ ...value, mode });
     };
 
-    const onSuggestionItemClick = useMemoizedFn(() => {
-      onSubmitPreflight();
+    const onSuggestionItemClick = useMemoizedFn((d: MentionInputSuggestionsOnSelectParams) => {
+      if (d.addValueToInput) {
+        onSubmitPreflight();
+      }
     });
 
     const onCloseCreateShortcutModal = useMemoizedFn(() => {
diff --git a/apps/web/src/controllers/ShortcutsController/ShortcutsController.tsx b/apps/web/src/controllers/ShortcutsController/ShortcutsController.tsx
index 74a9272c4..04619e790 100644
--- a/apps/web/src/controllers/ShortcutsController/ShortcutsController.tsx
+++ b/apps/web/src/controllers/ShortcutsController/ShortcutsController.tsx
@@ -146,8 +146,13 @@ const ShortcutItem: React.FC<{
 }> = React.memo(({ shortcut, onOpenEditShortcutModal }) => {
   const { mutateAsync: deleteShortcut } = useDeleteShortcut();
   return (
-    <div className="px-4 py-3.5 flex justify-between items-center gap-x-4 hover:bg-item-hover/60 border-b last:border-b-0">
-      <div className="flex flex-col space-y-0">
+    <div
+      className="px-4 py-3.5 flex justify-between items-center gap-x-4 hover:bg-item-hover/25 border-b last:border-b-0 cursor-pointer"
+      onClick={() => {
+        onOpenEditShortcutModal(shortcut.id);
+      }}
+    >
+      <div className="flex flex-col space-y-1">
         <Text>{shortcut.name}</Text>
         <Paragraph size={'xs'} variant={'secondary'} className="line-clamp-2">
           {shortcut.instructions}
diff --git a/apps/web/src/routes/app/_app/home.tsx b/apps/web/src/routes/app/_app/home.tsx
index a1bf8c6b3..a295a4bd6 100644
--- a/apps/web/src/routes/app/_app/home.tsx
+++ b/apps/web/src/routes/app/_app/home.tsx
@@ -35,7 +35,7 @@ export const Route = createFileRoute('/app/_app/home')({
 
 function RouteComponent() {
   return (
-    <AppPageLayout headerSizeVariant="list" header={<HomePageHeader />}>
+    <AppPageLayout headerSizeVariant="list" header={<HomePageHeader />} scrollable>
       <Outlet />
     </AppPageLayout>
   );