diff --git a/Source/Editor/Windows/ContentWindow.Search.cs b/Source/Editor/Windows/ContentWindow.Search.cs
index 1d8731ffa..a6fd2c81e 100644
--- a/Source/Editor/Windows/ContentWindow.Search.cs
+++ b/Source/Editor/Windows/ContentWindow.Search.cs
@@ -164,6 +164,7 @@ namespace FlaxEditor.Windows
             // Check if clear filters
             if (_itemsSearchBox.TextLength == 0 && !_viewDropdown.HasSelection)
             {
+                _view.IsSearching = false;
                 RefreshView();
                 return;
             }
diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs
index 43fd6b648..a2e40d133 100644
--- a/Source/Editor/Windows/ContentWindow.cs
+++ b/Source/Editor/Windows/ContentWindow.cs
@@ -814,7 +814,10 @@ namespace FlaxEditor.Windows
         /// </summary>
         public void RefreshView()
         {
-            RefreshView(SelectedNode);
+            if (_view.IsSearching)
+                UpdateItemsSearch();
+            else
+                RefreshView(SelectedNode);
         }
 
         /// <summary>