diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/ActionsList.axaml.cs b/src/ScriptRunner/ScriptRunner.GUI/Views/ActionsList.axaml.cs
index ffbd24b..b0e558f 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/ActionsList.axaml.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/ActionsList.axaml.cs
@@ -125,10 +125,17 @@ private void CategoryBadge_OnTapped(object? sender, RoutedEventArgs e)
             }
 
             if (DataContext is MainWindowViewModel viewModel)
-            {
-                viewModel.SelectedCategoryFilter = category;
-                // Gray state will be updated by PropertyChanged handler
-            }
+			{
+				if (viewModel.SelectedCategoryFilter != category)
+				{
+					viewModel.SelectedCategoryFilter = category;
+				}
+				else if (category != "All")
+				{
+					viewModel.SelectedCategoryFilter = "All";
+				}
+				// Gray state will be updated by PropertyChanged handler
+			}
         }
     }