diff --git a/apps/web/src/components/features/input/BusterChatInput/BusterChatInputBase.stories.tsx b/apps/web/src/components/features/input/BusterChatInput/BusterChatInputBase.stories.tsx
index ab73f7563..49bf2a6ae 100644
--- a/apps/web/src/components/features/input/BusterChatInput/BusterChatInputBase.stories.tsx
+++ b/apps/web/src/components/features/input/BusterChatInput/BusterChatInputBase.stories.tsx
@@ -208,52 +208,3 @@ export const NoShortcuts: Story = {
     },
   },
 };
-
-export const CustomPrompts: Story = {
-  args: {
-    defaultValue: '',
-    onSubmit: fn(),
-    onStop: fn(),
-    submitting: false,
-    disabled: false,
-    shortcuts: mockShortcuts,
-    suggestedPrompts: {
-      report: [
-        'Create a detailed financial summary for stakeholders',
-        'Generate monthly performance metrics report',
-        'Analyze year-over-year growth trends',
-        'Compile customer satisfaction survey results',
-        'Prepare executive dashboard summary',
-      ],
-      dashboard: [
-        'Build an interactive sales performance dashboard',
-        'Create a real-time inventory monitoring dashboard',
-        'Design customer analytics dashboard',
-        'Set up operational KPI dashboard',
-        'Develop marketing campaign performance dashboard',
-      ],
-      visualization: [
-        'Show revenue trends by product category',
-        'Create geographic sales distribution map',
-        'Visualize customer journey funnel',
-        'Display seasonal demand patterns',
-        'Chart employee productivity metrics',
-      ],
-      help: [
-        'What data visualization options are available?',
-        'How do I create custom metrics?',
-        'What are the best practices for dashboard design?',
-        'Can you explain predictive analytics features?',
-        'How do I share reports with my team?',
-      ],
-    },
-  },
-  parameters: {
-    docs: {
-      description: {
-        story:
-          'Chat input with custom suggested prompts - demonstrates how the component handles larger sets of suggestions (ensures 4 unique samples are selected).',
-      },
-    },
-  },
-};
diff --git a/apps/web/src/components/features/input/BusterChatInput/BusterChatInputButtons.tsx b/apps/web/src/components/features/input/BusterChatInput/BusterChatInputButtons.tsx
index c694446ea..99b87ce17 100644
--- a/apps/web/src/components/features/input/BusterChatInput/BusterChatInputButtons.tsx
+++ b/apps/web/src/components/features/input/BusterChatInput/BusterChatInputButtons.tsx
@@ -109,7 +109,7 @@ export const BusterChatInputButtons = React.memo(
           )}
           <AppTooltip
             delayDuration={disableSubmit ? 500 : 0}
-            title={disableSubmit ? 'Please type something...' : 'Submit'}
+            title={disableSubmit ? 'Please type something...' : submitting ? null : 'Submit'}
           >
             <Button
               rounding={'large'}
diff --git a/apps/web/src/components/features/input/Mentions/ShortcutsSuggestions/ShortcutsSuggestions.tsx b/apps/web/src/components/features/input/Mentions/ShortcutsSuggestions/ShortcutsSuggestions.tsx
index 6405b4124..e144bceba 100644
--- a/apps/web/src/components/features/input/Mentions/ShortcutsSuggestions/ShortcutsSuggestions.tsx
+++ b/apps/web/src/components/features/input/Mentions/ShortcutsSuggestions/ShortcutsSuggestions.tsx
@@ -39,34 +39,39 @@ export const useCreateShortcutsMentionsSuggestions = (
         trigger: SHORTCUT_MENTION_TRIGGER,
         items: ({ defaultQueryMentionsFilter, editor, query }) => {
           const shortcuts = currentItemsRef.current;
-          const allItems: MentionInputTriggerItem[] = [
-            {
+          const allItems: MentionInputTriggerItem[] = [];
+          if (shortcuts.length > 0) {
+            allItems.push({
               type: 'group',
               items: shortcuts.map((s) => createShortcutForMention(s, editor)),
               className: 'max-h-[300px] overflow-y-auto',
-            },
-            { type: 'separator' as const },
-            {
-              value: 'manageShortcuts',
-              label: 'Manage shortcuts',
-              icon: <PenWriting />,
-              doNotAddPipeOnSelect: true,
-              onSelect: () => {
-                navigate({
-                  to: '/app/home/shortcuts',
-                });
+            });
+            allItems.push({ type: 'separator' as const });
+          }
+          allItems.push(
+            ...[
+              {
+                value: 'manageShortcuts',
+                label: 'Manage shortcuts',
+                icon: <PenWriting />,
+                doNotAddPipeOnSelect: true,
+                onSelect: () => {
+                  navigate({
+                    to: '/app/home/shortcuts',
+                  });
+                },
               },
-            },
-            {
-              value: 'createShortcut',
-              label: 'Create shortcut',
-              icon: <Plus />,
-              doNotAddPipeOnSelect: true,
-              onSelect: () => {
-                setOpenCreateShortcutModal(true);
+              {
+                value: 'createShortcut',
+                label: 'Create shortcut',
+                icon: <Plus />,
+                doNotAddPipeOnSelect: true,
+                onSelect: () => {
+                  setOpenCreateShortcutModal(true);
+                },
               },
-            },
-          ];
+            ]
+          );
           return defaultQueryMentionsFilter(query, allItems);
         },
         popoverContent: ShortcutPopoverContent,