diff --git a/src/Views/TagsView.axaml b/src/Views/TagsView.axaml
index a66f4728..c0837dac 100644
--- a/src/Views/TagsView.axaml
+++ b/src/Views/TagsView.axaml
@@ -47,8 +47,9 @@
                             Classes="filter"
                             Margin="0,0,8,0"
                             Background="Transparent"
-                            IsCheckedChanged="OnToggleFilter"
-                            IsChecked="{Binding IsFiltered}"
+                            Click="OnToggleFilterClicked"
+                            IsChecked="{Binding IsFiltered, Mode=TwoWay}"
+                            IsVisible="{Binding !IsFolder}"
                             ToolTip.Tip="{DynamicResource Text.Filter}"/>
             </Grid>
           </DataTemplate>
@@ -78,8 +79,8 @@
                             Classes="filter"
                             Margin="0,0,8,0"
                             Background="Transparent"
-                            IsCheckedChanged="OnToggleFilter"
-                            IsChecked="{Binding IsFiltered}"
+                            Click="OnToggleFilterClicked"
+                            IsChecked="{Binding IsFiltered, Mode=TwoWay}"
                             ToolTip.Tip="{DynamicResource Text.Filter}"/>
             </Grid>
           </DataTemplate>
diff --git a/src/Views/TagsView.axaml.cs b/src/Views/TagsView.axaml.cs
index ea47876e..29b591fb 100644
--- a/src/Views/TagsView.axaml.cs
+++ b/src/Views/TagsView.axaml.cs
@@ -247,7 +247,7 @@ namespace SourceGit.Views
             }
         }
 
-        private void OnToggleFilter(object sender, RoutedEventArgs e)
+        private void OnToggleFilterClicked(object sender, RoutedEventArgs e)
         {
             if (sender is ToggleButton toggle && DataContext is ViewModels.Repository repo)
             {