diff --git a/TorchRemote.Plugin/ConfigControl.xaml b/TorchRemote.Plugin/ConfigControl.xaml
new file mode 100644
index 0000000..9d36430
--- /dev/null
+++ b/TorchRemote.Plugin/ConfigControl.xaml
@@ -0,0 +1,18 @@
+<UserControl x:Class="TorchRemote.Plugin.ConfigControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:TorchRemote.Plugin"
+             xmlns:views="clr-namespace:Torch.Views;assembly=Torch"
+             mc:Ignorable="d"
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <views:PropertyGrid Margin="3" />
+        <Button Grid.Row="1" Margin="5" Content="Save" Click="ButtonBase_OnClick" />
+    </Grid>
+</UserControl>
diff --git a/TorchRemote.Plugin/ConfigControl.xaml.cs b/TorchRemote.Plugin/ConfigControl.xaml.cs
new file mode 100644
index 0000000..85396fc
--- /dev/null
+++ b/TorchRemote.Plugin/ConfigControl.xaml.cs
@@ -0,0 +1,21 @@
+using System.Windows;
+using System.Windows.Controls;
+using Torch;
+
+namespace TorchRemote.Plugin;
+
+public partial class ConfigControl : UserControl
+{
+    private readonly Persistent<Config> _persistent;
+
+    public ConfigControl(Persistent<Config> persistent)
+    {
+        _persistent = persistent;
+        InitializeComponent();
+    }
+
+    private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
+    {
+        _persistent.Save();
+    }
+}
\ No newline at end of file
diff --git a/TorchRemote.Plugin/Plugin.cs b/TorchRemote.Plugin/Plugin.cs
index b76e23b..bd9d3d6 100644
--- a/TorchRemote.Plugin/Plugin.cs
+++ b/TorchRemote.Plugin/Plugin.cs
@@ -25,9 +25,8 @@ public class Plugin : TorchPluginBase, IWpfPlugin
             .AddFactory(s => new ChatMonitorManager(s.Torch));
     }
 
-    public UserControl GetControl() => new PropertyGrid
+    public UserControl GetControl() => new ConfigControl(_config)
     {
-        Margin = new(3),
         DataContext = _config.Data
     };
 }
diff --git a/TorchRemote.Plugin/manifest.xml b/TorchRemote.Plugin/manifest.xml
index b5debc5..36ae4b7 100644
--- a/TorchRemote.Plugin/manifest.xml
+++ b/TorchRemote.Plugin/manifest.xml
@@ -2,5 +2,5 @@
 <PluginManifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <Name>Torch Remote</Name>
     <Guid>284017F3-9682-4841-A544-EB04DB8CB9BA</Guid>
-    <Version>v1.0.5</Version>
+    <Version>v1.0.6</Version>
 </PluginManifest>
\ No newline at end of file