diff --git a/SqlDatabaseVectorSearch/Components/Pages/Ask.razor b/SqlDatabaseVectorSearch/Components/Pages/Ask.razor
index d8d30a9..b18fa18 100644
--- a/SqlDatabaseVectorSearch/Components/Pages/Ask.razor
+++ b/SqlDatabaseVectorSearch/Components/Pages/Ask.razor
@@ -49,12 +49,12 @@
                                 <div class="card card-text d-inline-block p-2 px-3 m-1">
                                     <div class="message-content">
                                         <div class="streaming-content">
-                                            <div class="streaming-text">
+                                            <div class="streaming-text @(message.Status == MessageStatus.Streaming ? "streaming-text-with-spinner" : "")">
                                                 <Markdown style="overflow-y:auto;">@message.Text</Markdown>
                                             </div>
                                             @if (message.Status == MessageStatus.Streaming)
                                             {
-                                                <div class="streaming-spinner-bottom-right">
+                                                <div class="streaming-spinner-bottom-left">
                                                     <Spinner Size="SpinnerSize.Small" Color="SpinnerColor.Primary" />
                                                 </div>
                                             }
@@ -327,7 +327,7 @@
 
         public string? TokenUsage { get; set; }
 
-        // List of citations extracted from the answer
+        // List of citations extracted from the answer.
         public IEnumerable<Citation>? Citations { get; set; }
     }
 
diff --git a/SqlDatabaseVectorSearch/Components/Pages/Ask.razor.css b/SqlDatabaseVectorSearch/Components/Pages/Ask.razor.css
index 88c6c81..cb1f054 100644
--- a/SqlDatabaseVectorSearch/Components/Pages/Ask.razor.css
+++ b/SqlDatabaseVectorSearch/Components/Pages/Ask.razor.css
@@ -82,20 +82,23 @@ input[type="checkbox"] + label {
 }
 
 .streaming-content {
-    display: flex;
-    align-items: flex-end;
-    gap: 8px;
+    position: relative;
     min-height: 1.5em;
 }
 
 .streaming-text {
-    flex: 1;
-    min-width: 0;
+    /* Add padding to make space for the spinner when streaming */
 }
 
-.streaming-spinner-bottom-right {
-    flex-shrink: 0;
-    align-self: flex-end;
+.streaming-text-with-spinner {
+    padding-bottom: 28px; /* Space for spinner (16px height + 8px margin + 4px extra) */
+}
+
+.streaming-spinner-bottom-left {
+    position: absolute;
+    bottom: 2px;
+    left: 0px;
+    z-index: 10;
 }
 
 .btn-clipboard {