diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 9f811e322..33d88fc42 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -15,7 +15,8 @@
         Title="{DynamicResource flowlauncher_settings}"
         ResizeMode="CanResizeWithGrip"
         WindowStartupLocation="CenterScreen"
-        Height="600" Width="850"
+        Height="600" Width="900"
+        MinWidth="850"
         Closed="OnClosed"
         d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}">
     <Window.InputBindings>
@@ -141,60 +142,58 @@
                                 <ColumnDefinition Width="48" />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                            </Grid.RowDefinitions>
                             <Image Source="{Binding Image, IsAsync=True}"
-                                   Width="48" Height="48" HorizontalAlignment="Left" VerticalAlignment="Top" />
-                            <Grid Margin="10,0,0,0" Grid.Column="1" HorizontalAlignment="Stretch">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-                                <Grid Grid.Row="0">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition />
-                                        <ColumnDefinition />
-                                    </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding PluginPair.Metadata.Name}"
-                                               Grid.Column="0"
-                                               Cursor="Hand" MouseUp="OnPluginNameClick" FontSize="24"
-                                               HorizontalAlignment="Left">
-                                            <ToolTipService.ToolTip>
-                                                <TextBlock>
-                                                    <Run Text="{DynamicResource author}" />
-                                                    <Run Text=": " />
-                                                    <Run Text="{Binding PluginPair.Metadata.Author}" />
-                                                </TextBlock>
-                                            </ToolTipService.ToolTip>
-                                     </TextBlock>
-                                    <ui:ToggleSwitch Grid.Column="1" OffContent="{DynamicResource disable}" OnContent="{DynamicResource enable}" 
-                                                     MaxWidth="110" HorizontalAlignment="Right"
-                                                     IsOn="{Binding PluginState}"/>
-                                </Grid>
-                                <TextBlock Text="{Binding PluginPair.Metadata.Description}"
-                                           Grid.Row="1" Opacity="0.5" />
-                                <DockPanel Grid.Row="2" Margin="0 10 0 8" HorizontalAlignment="Right">
-                                    <TextBlock Text="Priority" Margin="20,0,0,0"/>
-                                    <TextBlock Text="{Binding Priority}"
-                                               ToolTip="Change Plugin Results Priority"
-                                               Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
-                                               MouseUp="OnPluginPriorityClick"/>
-                                    <TextBlock Text="{DynamicResource actionKeywords}"
-                                               Visibility="{Binding ActionKeywordsVisibility}"
-                                               Margin="5 0 0 0"/>
-                                    <TextBlock Text="{Binding ActionKeywordsText}"
-                                               Visibility="{Binding ActionKeywordsVisibility}"
-                                               ToolTip="Change Action Keywords"
-                                               Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
-                                               MouseUp="OnPluginActionKeywordsClick" MaxWidth="100" />
-                                    <TextBlock Text="{DynamicResource plugin_init_time}" Margin="10 0 0 0" MaxWidth="100"/>
-                                    <TextBlock Text="{Binding InitilizaTime}" Margin="5 0 0 0" MaxWidth="100"/>
-                                    <TextBlock Text="{DynamicResource plugin_query_time}" Margin="10 0 0 0" MaxWidth="100"/>
-                                    <TextBlock Text="{Binding QueryTime}" Margin="5 0 0 0" MaxWidth="100"/>
-                                    <TextBlock Text="{DynamicResource pluginDirectory}"
-                                               MaxWidth="120" Cursor="Hand" Margin="20 0 0 0"
-                                               MouseUp="OnPluginDirecotyClick" Foreground="Blue" />
-                                </DockPanel>
+                                   Width="48" Height="48" 
+                                   HorizontalAlignment="Left" VerticalAlignment="Top"
+                                   Grid.RowSpan="2"/>
+                            <Grid Grid.Row="0" Grid.Column="1"
+                                  Margin="20,0,0,0">
+                                <TextBlock Text="{Binding PluginPair.Metadata.Name}"
+                                            Grid.Column="0"
+                                            Cursor="Hand" MouseUp="OnPluginNameClick" FontSize="24"
+                                            HorizontalAlignment="Left">
+                                        <ToolTipService.ToolTip>
+                                            <TextBlock>
+                                                <Run Text="{DynamicResource author}" />
+                                                <Run Text=": " />
+                                                <Run Text="{Binding PluginPair.Metadata.Author}" />
+                                            </TextBlock>
+                                        </ToolTipService.ToolTip>
+                                    </TextBlock>
+                                <ui:ToggleSwitch Grid.Column="1" OffContent="{DynamicResource disable}" OnContent="{DynamicResource enable}" 
+                                                    MaxWidth="110" HorizontalAlignment="Right"
+                                                    IsOn="{Binding PluginState}"/>
                             </Grid>
+                            <TextBlock Margin="20,0,0,0"
+                                       Text="{Binding PluginPair.Metadata.Description}"
+                                       Grid.Row="1" Opacity="0.5" Grid.Column="2" />
+                            <DockPanel Grid.ColumnSpan="2" Grid.Row="2" Margin="0 10 0 8" HorizontalAlignment="Right">
+                                <TextBlock Text="Priority" Margin="15,0,0,0" MaxWidth="100"/>
+                                <TextBlock Text="{Binding Priority}"
+                                            ToolTip="Change Plugin Results Priority"
+                                            Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
+                                            MouseUp="OnPluginPriorityClick"/>
+                                <TextBlock Text="{DynamicResource actionKeywords}"
+                                            Visibility="{Binding ActionKeywordsVisibility}"
+                                            Margin="5 0 0 0"/>
+                                <TextBlock Text="{Binding ActionKeywordsText}"
+                                            Visibility="{Binding ActionKeywordsVisibility}"
+                                            ToolTip="Change Action Keywords"
+                                            Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
+                                            MouseUp="OnPluginActionKeywordsClick" MaxWidth="100" />
+                                <TextBlock Text="{DynamicResource plugin_init_time}" Margin="10 0 0 0" MaxWidth="100"/>
+                                <TextBlock Text="{Binding InitilizaTime}" Margin="5 0 0 0" MaxWidth="100"/>
+                                <TextBlock Text="{DynamicResource plugin_query_time}" Margin="10 0 0 0" MaxWidth="100"/>
+                                <TextBlock Text="{Binding QueryTime}" Margin="5 0 0 0" MaxWidth="100"/>
+                                <TextBlock Text="{DynamicResource pluginDirectory}"
+                                            MaxWidth="120" Cursor="Hand" Margin="10,0,0,0"
+                                            MouseUp="OnPluginDirecotyClick" Foreground="Blue" />
+                            </DockPanel>
                         </Grid>
                     </ContentControl>