diff --git a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml
index 39d5f8a4e..b1a8744fd 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml
@@ -5,11 +5,12 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="{DynamicResource flowlauncher_plugin_program_directory}"
-    Width="530"
+    Width="Auto"
+    Height="276"
     Background="{DynamicResource PopuBGColor}"
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
-    SizeToContent="Height"
+    SizeToContent="Width"
     WindowStartupLocation="CenterScreen">
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
@@ -69,9 +70,9 @@
                         TextAlignment="Left"
                         TextWrapping="WrapWithOverflow" />
                 </StackPanel>
-                
-                <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
-                    <Grid Width="470">
+
+                <StackPanel Margin="0,10,10,0" Orientation="Horizontal">
+                    <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition />
                             <RowDefinition />
@@ -88,21 +89,22 @@
                             VerticalAlignment="Center"
                             FontSize="14"
                             Text="{DynamicResource flowlauncher_plugin_program_directory}" />
-                        <DockPanel 
-                            Grid.Row="0" 
-                            Grid.Column="1" 
+                        <DockPanel
+                            Grid.Row="0"
+                            Grid.Column="1"
                             LastChildFill="True">
                             <Button
-                                Width="70"
-                                HorizontalAlignment="Right"
+                                MinWidth="70"
+                                HorizontalAlignment="Stretch"
                                 Click="BrowseButton_Click"
-                                DockPanel.Dock="Right"
-                                Content="{DynamicResource flowlauncher_plugin_program_browse}" />
+                                Content="{DynamicResource flowlauncher_plugin_program_browse}"
+                                DockPanel.Dock="Right" />
                             <TextBox
                                 Name="Directory"
+                                MinWidth="300"
                                 Margin="10"
-                                VerticalAlignment="Center"
-                                HorizontalAlignment="Stretch" />
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center" />
                         </DockPanel>
                         <TextBlock
                             Grid.Row="1"
@@ -112,7 +114,8 @@
                             VerticalAlignment="Center"
                             FontSize="14"
                             Text="{DynamicResource flowlauncher_plugin_program_enabled}" />
-                        <CheckBox x:Name="Chkbox"
+                        <CheckBox
+                            x:Name="Chkbox"
                             Grid.Row="1"
                             Grid.Column="1"
                             Margin="10,0"