diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 659df263..05858d14 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -427,13 +427,6 @@ namespace SourceGit.ViewModels
             PopupHost.ShowAndStartPopup(new Cleanup(this));
         }
 
-        public void OpenConfigure()
-        {
-            if (!PopupHost.CanCreatePopup())
-                return;
-            PopupHost.ShowPopup(new RepositoryConfigure(this));
-        }
-
         public void ClearHistoriesFilter()
         {
             _settings.Filters.Clear();
diff --git a/src/ViewModels/RepositoryConfigure.cs b/src/ViewModels/RepositoryConfigure.cs
index 6472e733..bad30749 100644
--- a/src/ViewModels/RepositoryConfigure.cs
+++ b/src/ViewModels/RepositoryConfigure.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
-using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
 {
-    public class RepositoryConfigure : Popup
+    public class RepositoryConfigure : ObservableObject
     {
         public string UserName
         {
@@ -58,11 +58,9 @@ namespace SourceGit.ViewModels
                 GPGUserSigningKey = signingKey;
             if (_cached.TryGetValue("http.proxy", out var proxy))
                 HttpProxy = proxy;
-
-            View = new Views.RepositoryConfigure() { DataContext = this };
         }
 
-        public override Task<bool> Sure()
+        public void Save()
         {
             SetIfChanged("user.name", UserName);
             SetIfChanged("user.email", UserEmail);
@@ -70,7 +68,6 @@ namespace SourceGit.ViewModels
             SetIfChanged("tag.gpgsign", GPGTagSigningEnabled ? "true" : "false");
             SetIfChanged("user.signingkey", GPGUserSigningKey);
             SetIfChanged("http.proxy", HttpProxy);
-            return null;
         }
 
         private void SetIfChanged(string key, string value)
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index aa7501a2..38f6dc87 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -1,18 +1,53 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="using:SourceGit.ViewModels"
-             xmlns:v="using:SourceGit.Views"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="SourceGit.Views.RepositoryConfigure"
-             x:DataType="vm:RepositoryConfigure">
-  <StackPanel Orientation="Vertical" Margin="8,0">
-    <TextBlock FontSize="18"
-               Classes="bold"
-               Text="{DynamicResource Text.Configure}"/>
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:vm="using:SourceGit.ViewModels"
+                    xmlns:v="using:SourceGit.Views"
+                    mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+                    x:Class="SourceGit.Views.RepositoryConfigure"
+                    x:DataType="vm:RepositoryConfigure"
+                    Icon="/App.ico"
+                    Title="{DynamicResource Text.Configure}"
+                    Width="600" SizeToContent="Height"
+                    CanResize="False"
+                    WindowStartupLocation="CenterOwner">
+  <Grid RowDefinitions="Auto,Auto,Auto">
+    <!-- TitleBar -->
+    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30">
+      <Border Grid.Column="0" Grid.ColumnSpan="3"
+              Background="{DynamicResource Brush.TitleBar}"
+              BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
+              PointerPressed="BeginMoveWindow"/>
 
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32,32,32" ColumnDefinitions="150,*">
+      <Path Grid.Column="0"
+            Width="14" Height="14"
+            Data="{StaticResource Icons.Settings}"
+            Margin="10,0,0,0"
+            IsVisible="{OnPlatform True, macOS=False}"/>
+
+      <Grid Grid.Column="0" Classes="caption_button_box" Margin="2,4,0,0" IsVisible="{OnPlatform False, macOS=True}">
+        <Button Classes="caption_button_macos" Click="CloseWindow">
+          <Grid>
+            <Ellipse Fill="{DynamicResource Brush.MacOS.Close}"/>
+            <Path Height="6" Width="6" Stretch="Fill" Fill="#505050" Data="{StaticResource Icons.MacOS.Close}"/>
+          </Grid>
+        </Button>
+      </Grid>
+
+      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
+                 Classes="bold"
+                 Text="{DynamicResource Text.Configure}"
+                 HorizontalAlignment="Center" VerticalAlignment="Center"
+                 IsHitTestVisible="False"/>
+
+      <Button Grid.Column="2" Classes="caption_button" Click="CloseWindow" IsVisible="{OnPlatform True, macOS=False}">
+        <Path Data="{StaticResource Icons.Window.Close}"/>
+      </Button>
+    </Grid>
+
+    <!-- Body -->
+    <Grid Grid.Row="1" Margin="16,8,16,0" RowDefinitions="32,32,32,32,32,32" ColumnDefinitions="Auto,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -62,5 +97,23 @@
                 Content="{DynamicResource Text.Preference.GPG.TagEnabled}"
                 IsChecked="{Binding GPGTagSigningEnabled, Mode=TwoWay}"/>
     </Grid>
-  </StackPanel>
-</UserControl>
+
+    <!-- Options -->
+    <StackPanel Grid.Row="2"
+                Margin="8,4,8,8"
+                Height="32"
+                Orientation="Horizontal"
+                HorizontalAlignment="Center">
+      <Button Classes="flat primary"
+              Width="80"
+              Content="{DynamicResource Text.Sure}"
+              Click="SaveAndClose"
+              HotKey="Enter"/>
+      <Button Classes="flat"
+              Width="80"
+              Margin="8,0,0,0"
+              Content="{DynamicResource Text.Cancel}"
+              Click="CloseWindow"/>
+    </StackPanel>
+  </Grid>
+</v:ChromelessWindow>
diff --git a/src/Views/RepositoryConfigure.axaml.cs b/src/Views/RepositoryConfigure.axaml.cs
index 3726f238..0faa943b 100644
--- a/src/Views/RepositoryConfigure.axaml.cs
+++ b/src/Views/RepositoryConfigure.axaml.cs
@@ -1,12 +1,29 @@
-using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
-    public partial class RepositoryConfigure : UserControl
+    public partial class RepositoryConfigure : ChromelessWindow
     {
         public RepositoryConfigure()
         {
             InitializeComponent();
         }
+
+        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
+        {
+            BeginMoveDrag(e);
+        }
+
+        private void CloseWindow(object _1, RoutedEventArgs _2)
+        {
+            Close();
+        }
+
+        private void SaveAndClose(object _1, RoutedEventArgs _2)
+        {
+            (DataContext as ViewModels.RepositoryConfigure)?.Save();
+            Close();
+        }
     }
 }
diff --git a/src/Views/RepositoryToolbar.axaml b/src/Views/RepositoryToolbar.axaml
index 7b44693e..2961f0f8 100644
--- a/src/Views/RepositoryToolbar.axaml
+++ b/src/Views/RepositoryToolbar.axaml
@@ -24,6 +24,10 @@
         <Button Classes="icon_button" Width="32" Click="OpenStatistics" ToolTip.Tip="{DynamicResource Text.Repository.Statistics}">
           <Path Width="13" Height="13" Data="{StaticResource Icons.Statistics}"/>
         </Button>
+
+        <Button Classes="icon_button" Width="32" Click="OpenConfigure" ToolTip.Tip="{DynamicResource Text.Repository.Configure}">
+          <Path Width="14" Height="14" Data="{StaticResource Icons.Settings}"/>
+        </Button>
       </StackPanel>
 
       <StackPanel Grid.Column="1" Orientation="Horizontal">
@@ -72,10 +76,6 @@
         <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Command="{Binding Cleanup}" ToolTip.Tip="{DynamicResource Text.Repository.Clean}">
           <Path Width="14" Height="14" Margin="0,2,0,0" Data="{StaticResource Icons.Clean}"/>
         </Button>
-
-        <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Command="{Binding OpenConfigure}" ToolTip.Tip="{DynamicResource Text.Repository.Configure}">
-          <Path Width="14" Height="14" Data="{StaticResource Icons.Settings}"/>
-        </Button>
       </StackPanel>
 
       <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,4,0">
diff --git a/src/Views/RepositoryToolbar.axaml.cs b/src/Views/RepositoryToolbar.axaml.cs
index 40f90291..57fed44b 100644
--- a/src/Views/RepositoryToolbar.axaml.cs
+++ b/src/Views/RepositoryToolbar.axaml.cs
@@ -20,6 +20,26 @@ namespace SourceGit.Views
             }
         }
 
+        private async void OpenStatistics(object _, RoutedEventArgs e)
+        {
+            if (DataContext is ViewModels.Repository repo && TopLevel.GetTopLevel(this) is Window owner)
+            {
+                var dialog = new Statistics() { DataContext = new ViewModels.Statistics(repo.FullPath) };
+                await dialog.ShowDialog(owner);
+                e.Handled = true;
+            }
+        }
+
+        private async void OpenConfigure(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is ViewModels.Repository repo && TopLevel.GetTopLevel(this) is Window owner)
+            {
+                var dialog = new RepositoryConfigure() { DataContext = new ViewModels.RepositoryConfigure(repo) };
+                await dialog.ShowDialog(owner);
+                e.Handled = true;
+            }
+        }
+
         private void OpenGitFlowMenu(object sender, RoutedEventArgs e)
         {
             if (DataContext is ViewModels.Repository repo)
@@ -41,16 +61,6 @@ namespace SourceGit.Views
 
             e.Handled = true;
         }
-
-        private async void OpenStatistics(object _, RoutedEventArgs e)
-        {
-            if (DataContext is ViewModels.Repository repo && TopLevel.GetTopLevel(this) is Window owner)
-            {
-                var dialog = new Statistics() { DataContext = new ViewModels.Statistics(repo.FullPath) };
-                await dialog.ShowDialog(owner);
-                e.Handled = true;
-            }
-        }
     }
 }