diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
index 8a2a65f26..4fc12e89f 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
@@ -6,10 +6,11 @@
     xmlns:local="clr-namespace:Flow.Launcher.Plugin.BrowserBookmark.Models"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="{DynamicResource BookmarkDataSetting}"
-    Width="500"
+    Width="520"
     Background="{DynamicResource PopuBGColor}"
     Foreground="{DynamicResource PopupTextColor}"
     KeyDown="WindowKeyDown"
+    ResizeMode="NoResize"
     SizeToContent="Height"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
@@ -70,35 +71,50 @@
                         TextAlignment="Left" />
                 </StackPanel>
 
-                <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
-                    <TextBlock
-                        Width="140"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        FontSize="14"
-                        Text="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}" />
-                    <TextBox
-                        Width="120"
-                        Height="30"
-                        Margin="50,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Text="{Binding Name}" />
-                </StackPanel>
-                <StackPanel Margin="0,14,0,24" Orientation="Horizontal">
-                    <TextBlock
-                        Width="140"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        FontSize="14"
-                        Text="{DynamicResource flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory}" />
-                    <TextBox
-                        Width="250"
-                        Height="30"
-                        Margin="50,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Text="{Binding DataDirectoryPath}" />
+                <StackPanel Margin="0,10,0,20" Orientation="Horizontal">
+                    <Grid Width="444" HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition MinWidth="120" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Margin="5,0,0,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}" />
+                        <TextBox
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Width="120"
+                            Height="34"
+                            Margin="5,0,0,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Text="{Binding Name}" />
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="5,10,0,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory}" />
+                        <TextBox
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Height="34"
+                            Margin="5,10,0,0"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Center"
+                            Text="{Binding DataDirectoryPath}" />
+                    </Grid>
                 </StackPanel>
             </StackPanel>
         </StackPanel>
@@ -111,14 +127,12 @@
                 <Button
                     x:Name="btnCancel"
                     Width="145"
-                    Height="30"
                     Margin="0,0,5,0"
                     Click="ConfirmCancelEditCustomBrowser"
                     Content="{DynamicResource cancel}" />
                 <Button
                     Name="btnConfirm"
                     Width="145"
-                    Height="30"
                     Margin="5,0,0,0"
                     Click="ConfirmCancelEditCustomBrowser"
                     Style="{StaticResource AccentButtonStyle}">
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index 6762ca345..09ad2101b 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -33,12 +33,12 @@
             </ListView>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                 <Button
-                    Width="110"
+                    MinWidth="120"
                     Margin="10"
                     Click="NewCustomBrowser"
                     Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}" />
                 <Button
-                    Width="110"
+                    MinWidth="120"
                     Margin="10"
                     Click="DeleteCustomBrowser"
                     Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}" />