diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index 066801c89..3ff04d86c 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -14,6 +14,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
+
     <UserControl.Resources>
         <Style x:Key="ExplorerTabItem" TargetType="{x:Type TabItem}">
             <Setter Property="MinWidth" Value="120" />
@@ -99,10 +100,10 @@
                 </Setter.Value>
             </Setter>
         </Style>
+
         <DataTemplate x:Key="ListViewTemplateAccessLinks" DataType="qa:AccessLink">
             <TextBlock Margin="0 5 0 5" Text="{Binding Path, Mode=OneTime}" />
         </DataTemplate>
-        <core:TranslationConverter x:Key="TranslationConverter" />
         <DataTemplate x:Key="ListViewActionKeywords" DataType="{x:Type views:ActionKeywordModel}">
             <Grid>
                 <TextBlock
@@ -141,7 +142,7 @@
                     </TextBlock.Style>
                 </TextBlock>
 
-                <TextBlock Margin="500 5 0 0">
+                <TextBlock Margin="480 5 0 0">
                     <TextBlock.Style>
                         <Style TargetType="{x:Type TextBlock}">
                             <Style.Triggers>
@@ -160,9 +161,11 @@
             </Grid>
         </DataTemplate>
 
+        <core:TranslationConverter x:Key="TranslationConverter" />
         <converters:EnumNameConverter x:Key="EnumNameConverter" />
     </UserControl.Resources>
-    <Grid Margin="0">
+
+    <Grid Margin="{StaticResource SettingPanelMargin}">
         <TabControl
             x:Name="TabView"
             MinHeight="0"
@@ -179,225 +182,221 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_generalsetting_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Grid.Row="0" Margin="30 10 0 0">
-                    <StackPanel>
-                        <StackPanel Orientation="Vertical">
-                            <CheckBox
-                                Margin="0 10 0 0"
-                                HorizontalAlignment="Left"
-                                Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
-                                IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
-                            <CheckBox
-                                Margin="0 10 0 0"
-                                HorizontalAlignment="Left"
-                                Content="{DynamicResource plugin_explorer_default_open_in_file_manager}"
-                                IsChecked="{Binding Settings.DefaultOpenFolderInFileManager}" />
-                            <StackPanel Margin="0 10 0 10" Orientation="Horizontal">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" SharedSizeGroup="A" />
-                                        <ColumnDefinition Width="*" SharedSizeGroup="B" />
-                                    </Grid.ColumnDefinitions>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                    </Grid.RowDefinitions>
+                <StackPanel Orientation="Vertical">
+                    <StackPanel Orientation="Vertical">
+                        <CheckBox
+                            Margin="0 10 0 0"
+                            HorizontalAlignment="Left"
+                            Content="{DynamicResource plugin_explorer_use_location_as_working_dir}"
+                            IsChecked="{Binding Settings.UseLocationAsWorkingDir}" />
+                        <CheckBox
+                            Margin="0 10 0 0"
+                            HorizontalAlignment="Left"
+                            Content="{DynamicResource plugin_explorer_default_open_in_file_manager}"
+                            IsChecked="{Binding Settings.DefaultOpenFolderInFileManager}" />
+                        <StackPanel Margin="0 10 0 10" Orientation="Horizontal">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" SharedSizeGroup="A" />
+                                    <ColumnDefinition Width="*" SharedSizeGroup="B" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
 
-                                    <TextBlock
-                                        Grid.Row="0"
-                                        Grid.Column="0"
-                                        Margin="0 6 16 6"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_file_editor_path}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <StackPanel
-                                        Grid.Row="0"
-                                        Grid.Column="1"
-                                        Margin="0 6 6 6"
-                                        Orientation="Horizontal">
-                                        <TextBox
-                                            Width="250"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding FileEditorPath}"
-                                            TextWrapping="NoWrap" />
-                                        <Button
-                                            MinWidth="50"
-                                            Margin="5 0 0 0"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Command="{Binding OpenFileEditorPath}"
-                                            Content="..." />
-                                    </StackPanel>
-
-                                    <TextBlock
-                                        Grid.Row="1"
-                                        Grid.Column="0"
-                                        Margin="0 6 16 6"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_folder_editor_path}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <StackPanel
-                                        Grid.Row="1"
-                                        Grid.Column="1"
-                                        Margin="0 6 6 6"
-                                        Orientation="Horizontal">
-                                        <TextBox
-                                            Width="250"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding FolderEditorPath}"
-                                            TextWrapping="NoWrap" />
-                                        <Button
-                                            MinWidth="50"
-                                            Margin="5 0 0 0"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Command="{Binding OpenFolderEditorPath}"
-                                            Content="..." />
-                                    </StackPanel>
-
-                                    <TextBlock
-                                        Grid.Row="2"
-                                        Grid.Column="0"
-                                        Margin="0 16 6 6"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_shell_path}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <StackPanel
-                                        Grid.Row="2"
-                                        Grid.Column="1"
-                                        Orientation="Horizontal">
-                                        <TextBox
-                                            Width="250"
-                                            Margin="0 10 0 0"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding ShellPath}"
-                                            TextWrapping="NoWrap" />
-                                        <Button
-                                            MinWidth="50"
-                                            Margin="5 10 0 0"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            Command="{Binding OpenShellPath}"
-                                            Content="..." />
-                                    </StackPanel>
-                                </Grid>
-                            </StackPanel>
-
-                            <StackPanel Margin="0 0 0 5" Orientation="Horizontal">
-                                <Grid>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" SharedSizeGroup="C" />
-                                        <ColumnDefinition Width="*" SharedSizeGroup="D" />
-                                    </Grid.ColumnDefinitions>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                    </Grid.RowDefinitions>
-                                    <TextBlock
-                                        Grid.Row="0"
-                                        Grid.Column="0"
-                                        Margin="0 0 10 0"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_Index_Search_Engine}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <ComboBox
-                                        Grid.Row="0"
-                                        Grid.Column="1"
-                                        Width="250"
-                                        Margin="10 15 10 10"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        DisplayMemberPath="Description"
-                                        ItemsSource="{Binding IndexSearchEngines}"
-                                        SelectedItem="{Binding SelectedIndexSearchEngine}" />
-                                    <TextBlock
-                                        Grid.Row="1"
-                                        Grid.Column="0"
-                                        Margin="0 0 10 0"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_Content_Search_Engine}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <ComboBox
-                                        Grid.Row="1"
-                                        Grid.Column="1"
-                                        Width="250"
-                                        Margin="10"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        DisplayMemberPath="Description"
-                                        ItemsSource="{Binding ContentIndexSearchEngines}"
-                                        SelectedItem="{Binding SelectedContentSearchEngine}" />
-                                    <TextBlock
-                                        Grid.Row="2"
-                                        Grid.Column="0"
-                                        Margin="0 0 10 0"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_Directory_Recursive_Search_Engine}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <ComboBox
-                                        Grid.Row="2"
-                                        Grid.Column="1"
-                                        Width="250"
-                                        Margin="10"
-                                        HorizontalAlignment="Left"
-                                        VerticalAlignment="Center"
-                                        DisplayMemberPath="Description"
-                                        ItemsSource="{Binding PathEnumerationEngines}"
-                                        SelectedItem="{Binding SelectedPathEnumerationEngine}" />
-                                    <TextBlock
-                                        Grid.Row="3"
-                                        Grid.Column="0"
-                                        Margin="0 15 20 0"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_Excluded_File_Types}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <TextBlock
+                                    Grid.Row="0"
+                                    Grid.Column="0"
+                                    Margin="0 6 16 6"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource plugin_explorer_file_editor_path}"
+                                    TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <StackPanel
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    Margin="0 6 6 6"
+                                    Orientation="Horizontal">
                                     <TextBox
-                                        Grid.Row="3"
-                                        Grid.Column="1"
-                                        MinWidth="350"
-                                        Margin="0 9 0 6"
-                                        Text="{Binding ExcludedFileTypes}"
-                                        ToolTip="{DynamicResource plugin_explorer_Excluded_File_Types_Tooltip}" />
-                                    <TextBlock
-                                        Grid.Row="4"
-                                        Grid.Column="0"
-                                        Margin="0 15 20 0"
-                                        VerticalAlignment="Center"
-                                        Text="{DynamicResource plugin_explorer_Maximum_Results}"
-                                        TextBlock.Foreground="{DynamicResource Color05B}" />
-                                    <TextBox
-                                        Grid.Row="4"
-                                        Grid.Column="1"
-                                        MinWidth="350"
-                                        Margin="0 9 0 6"
+                                        Width="250"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
-                                        MaxLength="6"
-                                        PreviewTextInput="AllowOnlyNumericInput"
-                                        Text="{Binding MaxResult}"
-                                        ToolTip="{DynamicResource plugin_explorer_Maximum_Results_Tooltip}" />
-                                </Grid>
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal">
-                                <Button
-                                    Margin="0 10 10 20"
-                                    Padding="20 10 20 10"
-                                    Click="btnOpenIndexingOptions_Click"
-                                    Content="{DynamicResource plugin_explorer_Open_Window_Index_Option}" />
-                            </StackPanel>
+                                        Text="{Binding FileEditorPath}"
+                                        TextWrapping="NoWrap" />
+                                    <Button
+                                        MinWidth="50"
+                                        Margin="5 0 0 0"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        Command="{Binding OpenFileEditorPath}"
+                                        Content="..." />
+                                </StackPanel>
+
+                                <TextBlock
+                                    Grid.Row="1"
+                                    Grid.Column="0"
+                                    Margin="0 6 16 6"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource plugin_explorer_folder_editor_path}"
+                                    TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <StackPanel
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    Margin="0 6 6 6"
+                                    Orientation="Horizontal">
+                                    <TextBox
+                                        Width="250"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding FolderEditorPath}"
+                                        TextWrapping="NoWrap" />
+                                    <Button
+                                        MinWidth="50"
+                                        Margin="5 0 0 0"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        Command="{Binding OpenFolderEditorPath}"
+                                        Content="..." />
+                                </StackPanel>
+
+                                <TextBlock
+                                    Grid.Row="2"
+                                    Grid.Column="0"
+                                    Margin="0 16 6 6"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource plugin_explorer_shell_path}"
+                                    TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <StackPanel
+                                    Grid.Row="2"
+                                    Grid.Column="1"
+                                    Orientation="Horizontal">
+                                    <TextBox
+                                        Width="250"
+                                        Margin="0 10 0 0"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding ShellPath}"
+                                        TextWrapping="NoWrap" />
+                                    <Button
+                                        MinWidth="50"
+                                        Margin="5 10 0 0"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        Command="{Binding OpenShellPath}"
+                                        Content="..." />
+                                </StackPanel>
+                            </Grid>
                         </StackPanel>
 
-
+                        <StackPanel Margin="0 0 0 5" Orientation="Horizontal">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" SharedSizeGroup="C" />
+                                    <ColumnDefinition Width="*" SharedSizeGroup="D" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <TextBlock
+                                    Grid.Row="0"
+                                    Grid.Column="0"
+                                    Margin="0 0 10 0"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource plugin_explorer_Index_Search_Engine}"
+                                    TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <ComboBox
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    Width="250"
+                                    Margin="10 15 10 10"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    DisplayMemberPath="Description"
+                                    ItemsSource="{Binding IndexSearchEngines}"
+                                    SelectedItem="{Binding SelectedIndexSearchEngine}" />
+                                <TextBlock
+                                    Grid.Row="1"
+                                    Grid.Column="0"
+                                    Margin="0 0 10 0"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource plugin_explorer_Content_Search_Engine}"
+                                    TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <ComboBox
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    Width="250"
+                                    Margin="10"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    DisplayMemberPath="Description"
+                                    ItemsSource="{Binding ContentIndexSearchEngines}"
+                                    SelectedItem="{Binding SelectedContentSearchEngine}" />
+                                <TextBlock
+                                    Grid.Row="2"
+                                    Grid.Column="0"
+                                    Margin="0 0 10 0"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource plugin_explorer_Directory_Recursive_Search_Engine}"
+                                    TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <ComboBox
+                                    Grid.Row="2"
+                                    Grid.Column="1"
+                                    Width="250"
+                                    Margin="10"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    DisplayMemberPath="Description"
+                                    ItemsSource="{Binding PathEnumerationEngines}"
+                                    SelectedItem="{Binding SelectedPathEnumerationEngine}" />
+                                <TextBlock
+                                    Grid.Row="3"
+                                    Grid.Column="0"
+                                    Margin="0 15 20 0"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource plugin_explorer_Excluded_File_Types}"
+                                    TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <TextBox
+                                    Grid.Row="3"
+                                    Grid.Column="1"
+                                    MinWidth="350"
+                                    Margin="0 9 0 6"
+                                    Text="{Binding ExcludedFileTypes}"
+                                    ToolTip="{DynamicResource plugin_explorer_Excluded_File_Types_Tooltip}" />
+                                <TextBlock
+                                    Grid.Row="4"
+                                    Grid.Column="0"
+                                    Margin="0 15 20 0"
+                                    VerticalAlignment="Center"
+                                    Text="{DynamicResource plugin_explorer_Maximum_Results}"
+                                    TextBlock.Foreground="{DynamicResource Color05B}" />
+                                <TextBox
+                                    Grid.Row="4"
+                                    Grid.Column="1"
+                                    MinWidth="350"
+                                    Margin="0 9 0 6"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    MaxLength="6"
+                                    PreviewTextInput="AllowOnlyNumericInput"
+                                    Text="{Binding MaxResult}"
+                                    ToolTip="{DynamicResource plugin_explorer_Maximum_Results_Tooltip}" />
+                            </Grid>
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal">
+                            <Button
+                                Margin="0 10 10 20"
+                                Padding="20 10 20 10"
+                                Click="btnOpenIndexingOptions_Click"
+                                Content="{DynamicResource plugin_explorer_Open_Window_Index_Option}" />
+                        </StackPanel>
                     </StackPanel>
                 </StackPanel>
             </TabItem>
@@ -405,7 +404,7 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_native_context_menu_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Margin="30 20 10 10">
+                <StackPanel Orientation="Vertical">
                     <CheckBox
                         Margin="0 0 0 0"
                         Content="{DynamicResource plugin_explorer_native_context_menu_display_context_menu}"
@@ -461,7 +460,7 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_previewpanel_setting_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Margin="30 20 0 10">
+                <StackPanel Orientation="Vertical">
                     <TextBlock Foreground="{DynamicResource Color05B}" Text="{DynamicResource plugin_explorer_previewpanel_file_info_label}" />
                     <CheckBox
                         Margin="0 10 0 0"
@@ -512,7 +511,7 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_everything_setting_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <StackPanel Margin="10" Orientation="Vertical">
+                <StackPanel Orientation="Vertical">
                     <CheckBox
                         Margin="20 10 0 0"
                         HorizontalAlignment="Left"
@@ -619,98 +618,93 @@
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_quickaccesslinks_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <ScrollViewer>
-                    <DockPanel HorizontalAlignment="Stretch">
-                        <Border
-                            Margin="10 10 10 5"
-                            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                <DockPanel HorizontalAlignment="Stretch">
+                    <Border
+                        Margin="10 10 10 5"
+                        BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                        BorderThickness="1"
+                        DockPanel.Dock="Top">
+                        <ListView
+                            x:Name="lbxAccessLinks"
+                            Height="200"
+                            AllowDrop="True"
                             BorderThickness="1"
-                            DockPanel.Dock="Top">
-                            <ListView
-                                x:Name="lbxAccessLinks"
-                                Height="200"
-                                AllowDrop="True"
-                                BorderThickness="1"
-                                DragEnter="lbxAccessLinks_DragEnter"
-                                Drop="LbxAccessLinks_OnDrop"
-                                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
-                                ItemsSource="{Binding Settings.QuickAccessLinks}"
-                                SelectedItem="{Binding SelectedQuickAccessLink}" />
-                        </Border>
-                        <StackPanel
-                            HorizontalAlignment="Right"
-                            DockPanel.Dock="Bottom"
-                            Orientation="Horizontal">
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding RemoveLinkCommand}"
-                                CommandParameter="QuickAccessLink"
-                                Content="{DynamicResource plugin_explorer_delete}" />
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding EditLinkCommand}"
-                                CommandParameter="QuickAccessLink"
-                                Content="{DynamicResource plugin_explorer_edit}" />
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding AddLinkCommand}"
-                                CommandParameter="QuickAccessLink"
-                                Content="{DynamicResource plugin_explorer_add}" />
-                        </StackPanel>
-                    </DockPanel>
-                </ScrollViewer>
+                            DragEnter="lbxAccessLinks_DragEnter"
+                            Drop="LbxAccessLinks_OnDrop"
+                            ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
+                            ItemsSource="{Binding Settings.QuickAccessLinks}"
+                            SelectedItem="{Binding SelectedQuickAccessLink}" />
+                    </Border>
+                    <StackPanel
+                        HorizontalAlignment="Right"
+                        DockPanel.Dock="Bottom"
+                        Orientation="Horizontal">
+                        <Button
+                            MinWidth="100"
+                            Margin="10"
+                            Command="{Binding RemoveLinkCommand}"
+                            CommandParameter="QuickAccessLink"
+                            Content="{DynamicResource plugin_explorer_delete}" />
+                        <Button
+                            MinWidth="100"
+                            Margin="10"
+                            Command="{Binding EditLinkCommand}"
+                            CommandParameter="QuickAccessLink"
+                            Content="{DynamicResource plugin_explorer_edit}" />
+                        <Button
+                            MinWidth="100"
+                            Margin="10"
+                            Command="{Binding AddLinkCommand}"
+                            CommandParameter="QuickAccessLink"
+                            Content="{DynamicResource plugin_explorer_add}" />
+                    </StackPanel>
+                </DockPanel>
             </TabItem>
             <TabItem
                 Width="Auto"
                 Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
                 Style="{DynamicResource ExplorerTabItem}">
-                <ScrollViewer>
-                    <DockPanel HorizontalAlignment="Stretch">
-                        <Border
-                            Margin="10 10 10 5"
-                            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-                            BorderThickness="1"
-                            DockPanel.Dock="Top">
-                            <ListView
-                                Name="lbxExcludedPaths"
-                                Height="200"
-                                AllowDrop="True"
-                                DragEnter="lbxAccessLinks_DragEnter"
-                                Drop="LbxExcludedPaths_OnDrop"
-                                ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
-                                ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
-                                SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
-                        </Border>
-                        <StackPanel
-                            HorizontalAlignment="Right"
-                            DockPanel.Dock="Bottom"
-                            Orientation="Horizontal">
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding RemoveLinkCommand}"
-                                CommandParameter="IndexSearchExcludedPaths"
-                                Content="{DynamicResource plugin_explorer_delete}" />
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding EditLinkCommand}"
-                                CommandParameter="IndexSearchExcludedPaths"
-                                Content="{DynamicResource plugin_explorer_edit}" />
-                            <Button
-                                MinWidth="100"
-                                Margin="10"
-                                Command="{Binding AddLinkCommand}"
-                                CommandParameter="IndexSearchExcludedPaths"
-                                Content="{DynamicResource plugin_explorer_add}" />
-                        </StackPanel>
-                    </DockPanel>
-                </ScrollViewer>
+                <DockPanel HorizontalAlignment="Stretch">
+                    <Border
+                        Margin="10 10 10 5"
+                        BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+                        BorderThickness="1"
+                        DockPanel.Dock="Top">
+                        <ListView
+                            Name="lbxExcludedPaths"
+                            Height="200"
+                            AllowDrop="True"
+                            DragEnter="lbxAccessLinks_DragEnter"
+                            Drop="LbxExcludedPaths_OnDrop"
+                            ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"
+                            ItemsSource="{Binding Settings.IndexSearchExcludedSubdirectoryPaths}"
+                            SelectedItem="{Binding SelectedIndexSearchExcludedPath}" />
+                    </Border>
+                    <StackPanel
+                        HorizontalAlignment="Right"
+                        DockPanel.Dock="Bottom"
+                        Orientation="Horizontal">
+                        <Button
+                            MinWidth="100"
+                            Margin="10"
+                            Command="{Binding RemoveLinkCommand}"
+                            CommandParameter="IndexSearchExcludedPaths"
+                            Content="{DynamicResource plugin_explorer_delete}" />
+                        <Button
+                            MinWidth="100"
+                            Margin="10"
+                            Command="{Binding EditLinkCommand}"
+                            CommandParameter="IndexSearchExcludedPaths"
+                            Content="{DynamicResource plugin_explorer_edit}" />
+                        <Button
+                            MinWidth="100"
+                            Margin="10"
+                            Command="{Binding AddLinkCommand}"
+                            CommandParameter="IndexSearchExcludedPaths"
+                            Content="{DynamicResource plugin_explorer_add}" />
+                    </StackPanel>
+                </DockPanel>
             </TabItem>
         </TabControl>
-
     </Grid>
 </UserControl>