diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs
index f439c8229..b1f04c8f5 100644
--- a/Source/Editor/Windows/ContentWindow.cs
+++ b/Source/Editor/Windows/ContentWindow.cs
@@ -247,8 +247,17 @@ namespace FlaxEditor.Windows
             for (int i = 0; i < _viewDropdown.Items.Count; i++)
             {
                 var filterButton = filters.ContextMenu.AddButton(_viewDropdown.Items[i], OnFilterClicked);
+                filterButton.CloseMenuOnClick = false;
                 filterButton.Tag = i;
             }
+            filters.ContextMenu.ButtonClicked += button =>
+            {
+                foreach (var item in (filters.ContextMenu).Items)
+                {
+                    if (item is ContextMenuButton filterButton)
+                        filterButton.Checked = _viewDropdown.IsSelected(filterButton.Text);
+                }
+            };
             filters.ContextMenu.VisibleChanged += control =>
             {
                 if (!control.Visible)