diff --git a/app/MindWork AI Studio/Components/DataSourceSelection.razor b/app/MindWork AI Studio/Components/DataSourceSelection.razor
index abaf7088..4dd368e6 100644
--- a/app/MindWork AI Studio/Components/DataSourceSelection.razor	
+++ b/app/MindWork AI Studio/Components/DataSourceSelection.razor	
@@ -57,14 +57,14 @@
                     }
                     else if (this.showDataSourceSelection)
                     {
-                        <MudTextSwitch Label="@T("Are data sources enabled?")" Value="@this.areDataSourcesEnabled" LabelOn="@T("Yes, I want to use data sources.")" LabelOff="@T("No, I don't want to use data sources.")" ValueChanged="@this.EnabledChanged"/>
+                        <MudTextSwitch Label="@T("Are data sources enabled?")" Value="@this.areDataSourcesEnabled" LabelOn="@T("Yes, I want to use data sources.")" LabelOff="@T("No, I don't want to use data sources.")" ValueChanged="@this.EnabledChanged" Dense="@true"/>
                         @if (this.areDataSourcesEnabled)
                         {
-                            <MudTextSwitch Label="@T("AI-based data source selection")" Value="@this.aiBasedSourceSelection" LabelOn="@T("Yes, let the AI decide which data sources are needed.")" LabelOff="@T("No, I manually decide which data source to use.")" ValueChanged="@this.AutoModeChanged"/>
+                            <MudTextSwitch Label="@T("AI-based data source selection")" Value="@this.aiBasedSourceSelection" LabelOn="@T("Yes, let the AI decide which data sources are needed.")" LabelOff="@T("No, I manually decide which data source to use.")" ValueChanged="@this.AutoModeChanged" Dense="@true"/>
                             
                             @if (this.SettingsManager.ConfigurationData.AgentRetrievalContextValidation.EnableRetrievalContextValidation)
                             {
-                                <MudTextSwitch Label="@T("AI-based data validation")" Value="@this.aiBasedValidation" LabelOn="@T("Yes, let the AI validate & filter the retrieved data.")" LabelOff="@T("No, use all data retrieved from the data sources.")" ValueChanged="@this.ValidationModeChanged"/>
+                                <MudTextSwitch Label="@T("AI-based data validation")" Value="@this.aiBasedValidation" LabelOn="@T("Yes, let the AI validate & filter the retrieved data.")" LabelOff="@T("No, use all data retrieved from the data sources.")" ValueChanged="@this.ValidationModeChanged" Dense="@true"/>
                             }
 
                             @switch (this.aiBasedSourceSelection)
diff --git a/app/MindWork AI Studio/Components/MudTextSwitch.razor b/app/MindWork AI Studio/Components/MudTextSwitch.razor
index 353ac8b8..7f9c65ce 100644
--- a/app/MindWork AI Studio/Components/MudTextSwitch.razor	
+++ b/app/MindWork AI Studio/Components/MudTextSwitch.razor	
@@ -1,5 +1,5 @@
-<MudField Label="@this.Label" Variant="Variant.Outlined" Class="mb-3" Disabled="@this.Disabled">
-    <MudSwitch T="bool" Value="@this.Value" ValueChanged="@this.ValueChanged" Color="@this.Color" Validation="@this.Validation" Disabled="@this.Disabled">
+<MudField Label="@this.Label" Variant="Variant.Outlined" Class="@this.FieldClasses" Disabled="@this.Disabled">
+    <MudSwitch T="bool" Size="@this.SwitchSize" Value="@this.Value" ValueChanged="@this.ValueChanged" Color="@this.Color" Validation="@this.Validation" Disabled="@this.Disabled">
         @(this.Value ? this.LabelOn : this.LabelOff)
     </MudSwitch>
 </MudField>
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/MudTextSwitch.razor.cs b/app/MindWork AI Studio/Components/MudTextSwitch.razor.cs
index 2bce2c27..69411732 100644
--- a/app/MindWork AI Studio/Components/MudTextSwitch.razor.cs	
+++ b/app/MindWork AI Studio/Components/MudTextSwitch.razor.cs	
@@ -27,4 +27,19 @@ public partial class MudTextSwitch : ComponentBase
     
     [Parameter]
     public string LabelOff { get; set; } = string.Empty;
+    
+    /// <summary>
+    /// Whether to render this switch in its compact form.
+    /// </summary>
+    /// <remarks>
+    /// For places which stack several of these switches above other content, such as the data source
+    /// selection the chat opens from its footer. The roomy form stays the default, so that nothing
+    /// changes where this was never asked for.
+    /// </remarks>
+    [Parameter]
+    public bool Dense { get; set; }
+    
+    private string FieldClasses => this.Dense ? "mb-2" : "mb-3";
+    
+    private Size SwitchSize => this.Dense ? Size.Small : Size.Medium;
 }
\ No newline at end of file