diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 38c739fb2..07882445c 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -636,7 +636,7 @@
                                                                        ToolTip="Change Action Keywords"
                                                                        Margin="5 0 0 0" Cursor="Hand" FontWeight="Bold"
                                                                        Click="OnPluginActionKeywordsClick" HorizontalAlignment="Right"
-                                                                       Width="100" Height="32">
+                                                                       Width="100" Height="40">
                                                                 
                                                                 <Button.Resources>
                                                                     <Style TargetType="Border">
@@ -655,15 +655,31 @@
                                             </StackPanel>
 
                                             <StackPanel>
-                                                <Border Background="White" Padding="14 14 14 14"
+
+                                                <!--#region SubInfo Styling -->
+                                                <Border Background="White" Padding="14 0 14 0"
                                                         BorderThickness="0 1 0 0" BorderBrush="#e6e6e6"
                                                         VerticalAlignment="Center" HorizontalAlignment="Stretch"
                                                         MaxHeight="480">
-                                                    <ContentControl
-                                                        Content="{Binding SettingControl}"
-                                                        Padding="0" Margin="0" VerticalAlignment="Stretch"
-                                                        MaxWidth="750" />
+                                                    <Border.Style>
+                                                        <Style TargetType="{x:Type Border}">
+                                                            <Setter Property="Visibility" Value="Visible" />
+                                                            <Style.Triggers>
+                                                                <DataTrigger Binding="{Binding ElementName=SettingControl, Path=ActualHeight}" Value="0">
+                                                                    <Setter Property="Visibility" Value="Collapsed" />
+                                                                    <Setter Property="BorderThickness" Value="0" />
+                                                                </DataTrigger>
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </Border.Style>
                                                 </Border>
+                                                <!--#endregion-->
+                                                <ContentControl x:Name="SettingControl" 
+                                                        Content="{Binding SettingControl}"
+                                                        Padding="0 12 0 12" Margin="0 0 0 0" VerticalAlignment="Stretch"
+                                                        MaxWidth="750" >
+                                                    </ContentControl>
+                                                
                                             </StackPanel>
 
                                             <StackPanel>