diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AppAiChatPanel.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AppAiChatPanel.razor
index fd0a69a6f0..1ae903d2df 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AppAiChatPanel.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Layout/AppAiChatPanel.razor
@@ -63,6 +63,21 @@
                             }
                         }
 
+						<BitStack Alignment="BitAlignment.Center" FitHeight FillContent Class="default-prompt-container">
+
+							@foreach (var suggestion in followUpSuggestions)
+							{
+								<BitButton FixedColor
+										   Variant="BitVariant.Outline"
+										   Class="default-prompt-button"
+										   Color="BitColor.SecondaryBackground"
+										   OnClick="() => SendPromptMessage(suggestion)">
+									@suggestion
+								</BitButton>
+							}
+
+						</BitStack>
+
                         @if (isLoading && string.IsNullOrWhiteSpace(lastAssistantMessage?.Content))
                         {
                             <BitEllipsisLoading Size="BitSize.Small" />
@@ -99,24 +114,6 @@
                     </BitStack>
                 }
 
-                @if (followUpSuggestions.Any())
-                {
-                    <BitStack Alignment=" BitAlignment.Center" FitHeight FillContent Class="default-prompt-container">
-
-                        @foreach (var suggestion in followUpSuggestions)
-                        {
-                            <BitButton FixedColor
-                                       Variant="BitVariant.Outline"
-                                       Class="default-prompt-button"
-                                       Color="BitColor.SecondaryBackground"
-                                       OnClick="() => SendPromptMessage(suggestion)">
-                                @suggestion
-                            </BitButton>
-                        }
-
-                    </BitStack>
-                }
-
                 <BitStack FitHeight Style="position:relative">
                     <BitTextField Rows="1"
                                   Immediate