diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index bbaacc18c..a7fa58643 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -89,6 +89,7 @@
                 <Expander
                     x:Name="expExcludedPaths"
                     Margin="0,10,0,0"
+                    Collapsed="expExcludedPaths_Collapsed"
                     Expanded="expExcludedPaths_Click"
                     Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}">
                     <ListView
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
index 6f0bc49ee..63c4a8dca 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
@@ -60,9 +60,7 @@ namespace Flow.Launcher.Plugin.Explorer.Views
 
             lbxExcludedPaths.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
 
-            btnDelete.Visibility = Visibility.Hidden;
-            btnEdit.Visibility = Visibility.Hidden;
-            btnAdd.Visibility = Visibility.Hidden;
+            SetButtonVisibilityToHidden();
 
             if (expAccessLinks.IsExpanded || expExcludedPaths.IsExpanded || expActionKeywords.IsExpanded)
             {
@@ -123,8 +121,8 @@ namespace Flow.Launcher.Plugin.Explorer.Views
 
         private void expActionKeywords_Collapsed(object sender, RoutedEventArgs e)
         {
-            if (!expActionKeywords.IsExpanded)
-                expActionKeywords.Height = double.NaN;
+            expActionKeywords.Height = double.NaN;
+            SetButtonVisibilityToHidden();
         }
 
         private void expAccessLinks_Click(object sender, RoutedEventArgs e)
@@ -143,8 +141,8 @@ namespace Flow.Launcher.Plugin.Explorer.Views
 
         private void expAccessLinks_Collapsed(object sender, RoutedEventArgs e)
         {
-            if (!expAccessLinks.IsExpanded)
-                expAccessLinks.Height = double.NaN;
+            expAccessLinks.Height = double.NaN;
+            SetButtonVisibilityToHidden();
         }
 
         private void expExcludedPaths_Click(object sender, RoutedEventArgs e)
@@ -161,6 +159,11 @@ namespace Flow.Launcher.Plugin.Explorer.Views
             RefreshView();
         }
 
+        private void expExcludedPaths_Collapsed(object sender, RoutedEventArgs e)
+        {
+            SetButtonVisibilityToHidden();
+        }
+
         private void btnDelete_Click(object sender, RoutedEventArgs e)
         {
             var selectedRow = lbxAccessLinks.SelectedItem as AccessLink ?? lbxExcludedPaths.SelectedItem as AccessLink;
@@ -309,6 +312,13 @@ namespace Flow.Launcher.Plugin.Explorer.Views
         {
             viewModel.OpenWindowsIndexingOptions();
         }
+
+        public void SetButtonVisibilityToHidden()
+        {
+            btnDelete.Visibility = Visibility.Hidden;
+            btnEdit.Visibility = Visibility.Hidden;
+            btnAdd.Visibility = Visibility.Hidden;
+        }
     }
 
     public class ActionKeywordView