diff --git a/app/MindWork AI Studio/Components/LockableButton.razor b/app/MindWork AI Studio/Components/LockableButton.razor
new file mode 100644
index 00000000..81f964cc
--- /dev/null
+++ b/app/MindWork AI Studio/Components/LockableButton.razor	
@@ -0,0 +1,5 @@
+@inherits ConfigurationBaseCore
+
+<MudButton Variant="Variant.Filled" Color="@Color.Primary" StartIcon="@this.Icon" Disabled="@this.IsDisabled" Class="mt-3 mb-6" OnClick="@(async () => await this.ClickAsync())">
+    @this.Text
+</MudButton>
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/LockableButton.razor.cs b/app/MindWork AI Studio/Components/LockableButton.razor.cs
new file mode 100644
index 00000000..fe3c0f45
--- /dev/null
+++ b/app/MindWork AI Studio/Components/LockableButton.razor.cs	
@@ -0,0 +1,27 @@
+using Microsoft.AspNetCore.Components;
+
+namespace AIStudio.Components;
+
+public partial class LockableButton : ConfigurationBaseCore
+{
+    [Parameter]
+    public string Icon { get; set; } = Icons.Material.Filled.Info;
+    
+    [Parameter]
+    public Func<Task> OnClickAsync { get; set; } = () => Task.CompletedTask;
+    
+    [Parameter]
+    public Action OnClick { get; set; } = () => { };
+    
+    [Parameter]
+    public string Text { get; set; } = string.Empty;
+    
+    private async Task ClickAsync()
+    {
+        if (this.IsLocked() || this.Disabled())
+            return;
+        
+        await this.OnClickAsync();
+        this.OnClick();
+    }
+}
\ No newline at end of file
diff --git a/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor b/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor
index fe10c74e..8a8c1de9 100644
--- a/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor	
+++ b/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor	
@@ -75,11 +75,7 @@
         </MudText>
     }
     
-    <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>
+    <LockableButton Text="@T("Add Provider")" IsLocked="@(() => !this.SettingsManager.ConfigurationData.App.AllowUserToAddProvider)" Icon="@Icons.Material.Filled.AddRoad" OnClickAsync="@this.AddLLMProvider" />
     
     <MudText Typo="Typo.h4" Class="mb-3">
         @T("LLM Provider Confidence")