diff --git a/app/MindWork AI Studio/Assistants/AssistantBase.razor b/app/MindWork AI Studio/Assistants/AssistantBase.razor
index 6d4fdb51..f605189e 100644
--- a/app/MindWork AI Studio/Assistants/AssistantBase.razor	
+++ b/app/MindWork AI Studio/Assistants/AssistantBase.razor	
@@ -33,10 +33,11 @@
         
         <div id="@AFTER_RESULT_DIV_ID" class="mt-3">
         </div>
-        
+    </ChildContent>
+    <FooterContent>
         @if (this.FooterButtons.Count > 0)
         {
-            <MudStack Row="@true" Wrap="Wrap.Wrap" Class="mt-3 mr-2">
+            <MudStack Row="@true" Wrap="Wrap.Wrap" Class="ma-1">
                 @foreach (var button in this.FooterButtons)
                 {
                     switch (button)
@@ -54,14 +55,14 @@
                                 @buttonData.Text
                             </MudButton>
                             break;
-                            
+
                         case SendToButton sendToButton:
                             <MudMenu StartIcon="@Icons.Material.Filled.Apps" EndIcon="@Icons.Material.Filled.KeyboardArrowDown" Label="Send to ..." Variant="Variant.Filled" Color="Color.Info">
                                 @foreach (var assistant in Enum.GetValues<SendTo>().OrderBy(n => n.Name().Length))
                                 {
                                     if(assistant is SendTo.NONE || sendToButton.Self == assistant)
                                         continue;
-                                    
+
                                     <MudMenuItem OnClick="() => this.SendToAssistant(assistant, sendToButton)">
                                         @assistant.Name()
                                     </MudMenuItem>
@@ -78,5 +79,5 @@
                 </MudButton>
             </MudStack>
         }
-    </ChildContent>
+    </FooterContent>
 </InnerScrolling>
\ No newline at end of file
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v0.8.12.md b/app/MindWork AI Studio/wwwroot/changelog/v0.8.12.md
index d693db81..27eaf39c 100644
--- a/app/MindWork AI Studio/wwwroot/changelog/v0.8.12.md	
+++ b/app/MindWork AI Studio/wwwroot/changelog/v0.8.12.md	
@@ -2,6 +2,7 @@
 - Added an e-mail writing assistant.
 - Added the possibility to preselect some e-mail writing assistant options.
 - Fixed the header height of assistant pages.
+- Improved assistant footer handling; the footer is now fixed at the bottom of the page.
 - Improved the coding assistant by adding a button to delete a context.
 - Improved chat page by scrolling to the bottom after loading (configurable; default is on).
 - Improved all assistants to provide a button to copy their respective result to the clipboard.