diff --git a/app/MindWork AI Studio/Components/ConfigurationBase.razor.cs b/app/MindWork AI Studio/Components/ConfigurationBase.razor.cs
index 10f4ae3f..46299c09 100644
--- a/app/MindWork AI Studio/Components/ConfigurationBase.razor.cs	
+++ b/app/MindWork AI Studio/Components/ConfigurationBase.razor.cs	
@@ -26,6 +26,12 @@ public partial class ConfigurationBase : MSGComponentBase
     [Parameter]
     public Func<bool> Disabled { get; set; } = () => false;
     
+    /// <summary>
+    /// Is the option disabled by a plugin?
+    /// </summary>
+    [Parameter]
+    public Func<bool> LockedByPlugin { get; set; } = () => false;
+    
     protected const string MARGIN_CLASS = "mb-6";
     protected static readonly Dictionary<string, object?> SPELLCHECK_ATTRIBUTES = new();
     
diff --git a/app/MindWork AI Studio/Components/ConfigurationSelect.razor b/app/MindWork AI Studio/Components/ConfigurationSelect.razor
index 99120aa9..3cca9700 100644
--- a/app/MindWork AI Studio/Components/ConfigurationSelect.razor	
+++ b/app/MindWork AI Studio/Components/ConfigurationSelect.razor	
@@ -1,11 +1,13 @@
 @inherits ConfigurationBase
 @typeparam T
 
-<MudSelect T="T" Value="@this.SelectedValue()" Strict="@true" ShrinkLabel="@true" Disabled="@this.Disabled()" Margin="Margin.Dense" Label="@this.OptionDescription" Class="@GetClass" Variant="Variant.Outlined" HelperText="@this.OptionHelp" ValueChanged="@this.OptionChanged">
-    @foreach (var data in this.Data)
-    {
-        <MudSelectItem Value="@data.Value">
-            @data.Name
-        </MudSelectItem>
-    }
-</MudSelect>
\ No newline at end of file
+<MudTooltip Text="Disabled by a plugin" Disabled="@(!this.LockedByPlugin())" Arrow="true" Placement="Placement.Top">
+    <MudSelect T="T" Value="@this.SelectedValue()" Strict="@true" ShrinkLabel="@true" Disabled="@(this.Disabled() || this.LockedByPlugin())" Margin="Margin.Dense" Label="@this.OptionDescription" Class="@GetClass" Variant="Variant.Outlined" HelperText="@this.OptionHelp" ValueChanged="@this.OptionChanged">
+        @foreach (var data in this.Data)
+        {
+            <MudSelectItem Value="@data.Value">
+                @data.Name
+            </MudSelectItem>
+        }
+    </MudSelect>
+</MudTooltip>
diff --git a/app/MindWork AI Studio/Components/Settings/SettingsPanelApp.razor b/app/MindWork AI Studio/Components/Settings/SettingsPanelApp.razor
index 1ad60ba2..42f2d12e 100644
--- a/app/MindWork AI Studio/Components/Settings/SettingsPanelApp.razor	
+++ b/app/MindWork AI Studio/Components/Settings/SettingsPanelApp.razor	
@@ -13,7 +13,7 @@
     <ConfigurationSelect OptionDescription="@T("Color theme")" SelectedValue="@(() => this.SettingsManager.ConfigurationData.App.PreferredTheme)" Data="@ConfigurationSelectDataFactory.GetThemesData()" SelectionUpdate="@(selectedValue => this.SettingsManager.ConfigurationData.App.PreferredTheme = selectedValue)" OptionHelp="@T("Choose the color theme that best suits for you.")"/>
     <ConfigurationOption OptionDescription="@T("Save energy?")" LabelOn="@T("Energy saving is enabled")" LabelOff="@T("Energy saving is disabled")" State="@(() => this.SettingsManager.ConfigurationData.App.IsSavingEnergy)" StateUpdate="@(updatedState => this.SettingsManager.ConfigurationData.App.IsSavingEnergy = updatedState)" OptionHelp="@T("When enabled, streamed content from the AI is updated once every third second. When disabled, streamed content will be updated as soon as it is available.")"/>
     <ConfigurationOption OptionDescription="@T("Enable spellchecking?")" LabelOn="@T("Spellchecking is enabled")" LabelOff="@T("Spellchecking is disabled")" State="@(() => this.SettingsManager.ConfigurationData.App.EnableSpellchecking)" StateUpdate="@(updatedState => this.SettingsManager.ConfigurationData.App.EnableSpellchecking = updatedState)" OptionHelp="@T("When enabled, spellchecking will be active in all input fields. Depending on your operating system, errors may not be visually highlighted, but right-clicking may still offer possible corrections.")"/>
-    <ConfigurationSelect OptionDescription="@T("Check for updates")" SelectedValue="@(() => this.SettingsManager.ConfigurationData.App.UpdateBehavior)" Data="@ConfigurationSelectDataFactory.GetUpdateBehaviorData()" SelectionUpdate="@(selectedValue => this.SettingsManager.ConfigurationData.App.UpdateBehavior = selectedValue)" OptionHelp="@T("How often should we check for app updates?")" Disabled="() => this.SettingsLocker.IsLocked<DataApp>(x => x.UpdateBehavior)"/>
+    <ConfigurationSelect OptionDescription="@T("Check for updates")" SelectedValue="@(() => this.SettingsManager.ConfigurationData.App.UpdateBehavior)" Data="@ConfigurationSelectDataFactory.GetUpdateBehaviorData()" SelectionUpdate="@(selectedValue => this.SettingsManager.ConfigurationData.App.UpdateBehavior = selectedValue)" OptionHelp="@T("How often should we check for app updates?")" LockedByPlugin="() => this.SettingsLocker.IsLocked<DataApp>(x => x.UpdateBehavior)"/>
     <ConfigurationSelect OptionDescription="@T("Navigation bar behavior")" SelectedValue="@(() => this.SettingsManager.ConfigurationData.App.NavigationBehavior)" Data="@ConfigurationSelectDataFactory.GetNavBehaviorData()" SelectionUpdate="@(selectedValue => this.SettingsManager.ConfigurationData.App.NavigationBehavior = selectedValue)" OptionHelp="@T("Select the desired behavior for the navigation bar.")"/>
     <ConfigurationSelect OptionDescription="@T("Preview feature visibility")" SelectedValue="@(() => this.SettingsManager.ConfigurationData.App.PreviewVisibility)" Data="@ConfigurationSelectDataFactory.GetPreviewVisibility()" SelectionUpdate="@this.UpdatePreviewFeatures" OptionHelp="@T("Do you want to show preview features in the app?")"/>
 
diff --git a/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor b/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor
index 608f72c0..fe10c74e 100644
--- a/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor	
+++ b/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor	
@@ -74,10 +74,12 @@
             @T("No providers configured yet.")
         </MudText>
     }
-
-    <MudButton Variant="Variant.Filled" Color="@Color.Primary" StartIcon="@Icons.Material.Filled.AddRoad" Class="mt-3 mb-6" OnClick="@this.AddLLMProvider" Disabled="@this.SettingsManager.ConfigurationData.App.DontAllowUserToAddProvider"> 
-        @T("Add Provider")
-    </MudButton>
+    
+    <MudTooltip Text="Disabled by a plugin" Disabled="@(!this.SettingsManager.ConfigurationData.App.DontAllowUserToAddProvider)" Arrow="true" Placement="Placement.Top">
+        <MudButton Variant="Variant.Filled" Color="@Color.Primary" StartIcon="@Icons.Material.Filled.AddRoad" Class="mt-3 mb-6" OnClick="@this.AddLLMProvider" Disabled="@this.SettingsManager.ConfigurationData.App.DontAllowUserToAddProvider"> 
+            @T("Add Provider")
+        </MudButton>
+    </MudTooltip>
     
     <MudText Typo="Typo.h4" Class="mb-3">
         @T("LLM Provider Confidence")