diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 07882445c..b0f596372 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -538,7 +538,7 @@
                     <TextBlock Text="{DynamicResource plugin}" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>
                 </Border>
                 <Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3">
-                    <ListBox SelectedIndex="0" SelectedItem="{Binding SelectedPlugin}"
+                    <ListBox SelectedItem="{Binding SelectedPlugin}"
                              ItemsSource="{Binding PluginViewModels}"
                              Margin="6, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                              ItemContainerStyle="{StaticResource PluginList}"
@@ -656,11 +656,11 @@
 
                                             <StackPanel>
 
-                                                <!--#region SubInfo Styling -->
-                                                <Border Background="White" Padding="14 0 14 0"
+                                                
+                                                <Border Background="White" Padding="0"
                                                         BorderThickness="0 1 0 0" BorderBrush="#e6e6e6"
-                                                        VerticalAlignment="Center" HorizontalAlignment="Stretch"
-                                                        MaxHeight="480">
+                                                        VerticalAlignment="Center" HorizontalAlignment="Stretch">
+                                                    <!--#region SubInfo Styling -->
                                                     <Border.Style>
                                                         <Style TargetType="{x:Type Border}">
                                                             <Setter Property="Visibility" Value="Visible" />
@@ -668,6 +668,7 @@
                                                                 <DataTrigger Binding="{Binding ElementName=SettingControl, Path=ActualHeight}" Value="0">
                                                                     <Setter Property="Visibility" Value="Collapsed" />
                                                                     <Setter Property="BorderThickness" Value="0" />
+                                                                    <Setter Property="Padding" Value="0" />
                                                                 </DataTrigger>
                                                             </Style.Triggers>
                                                         </Style>
@@ -676,8 +677,8 @@
                                                 <!--#endregion-->
                                                 <ContentControl x:Name="SettingControl" 
                                                         Content="{Binding SettingControl}"
-                                                        Padding="0 12 0 12" Margin="0 0 0 0" VerticalAlignment="Stretch"
-                                                        MaxWidth="750" >
+                                                        Padding="1" Margin="0" VerticalAlignment="Stretch"
+                                                        MaxWidth="750" MaxHeight="550">
                                                     </ContentControl>
                                                 
                                             </StackPanel>
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
index 374bccf62..01108895d 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
@@ -15,7 +15,7 @@
         <core:LocalizationConverter x:Key="LocalizationConverter"/>
     </UserControl.Resources>
 
-    <Grid Margin="20 0 0 0">
+    <Grid Margin="20 14 0 14">
         <Grid.RowDefinitions>
             <RowDefinition Height="auto"/>
             <RowDefinition Height="auto"/>
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
index cb0b50069..efdd9ec9b 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
@@ -32,7 +32,7 @@
             </DockPanel>
         </DataTemplate>
     </UserControl.Resources>
-    <Grid Margin="10 10 0 0">
+    <Grid Margin="14">
         <Grid.RowDefinitions>
             <RowDefinition Height="30" />
             <RowDefinition Height="48" />