diff --git a/Source/Editor/Modules/ContentFindingModule.cs b/Source/Editor/Modules/ContentFindingModule.cs
index 647daef2b..93fe06d64 100644
--- a/Source/Editor/Modules/ContentFindingModule.cs
+++ b/Source/Editor/Modules/ContentFindingModule.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using FlaxEditor.Content;
 using FlaxEditor.SceneGraph;
-using FlaxEditor.Surface.ContextMenu;
+using FlaxEditor.Windows.Search;
 using FlaxEngine;
 using FlaxEngine.GUI;
 
diff --git a/Source/Editor/Surface/ContextMenu/ContentFinder.cs b/Source/Editor/Windows/Search/ContentFinder.cs
similarity index 99%
rename from Source/Editor/Surface/ContextMenu/ContentFinder.cs
rename to Source/Editor/Windows/Search/ContentFinder.cs
index 27bda994e..244950dd9 100644
--- a/Source/Editor/Surface/ContextMenu/ContentFinder.cs
+++ b/Source/Editor/Windows/Search/ContentFinder.cs
@@ -7,7 +7,7 @@ using FlaxEditor.Modules;
 using FlaxEngine;
 using FlaxEngine.GUI;
 
-namespace FlaxEditor.Surface.ContextMenu
+namespace FlaxEditor.Windows.Search
 {
     /// <summary>
     /// The content finder popup. Allows to search for project items and quickly navigate to.
diff --git a/Source/Editor/Surface/ContextMenu/SearchItem.cs b/Source/Editor/Windows/Search/SearchItem.cs
similarity index 98%
rename from Source/Editor/Surface/ContextMenu/SearchItem.cs
rename to Source/Editor/Windows/Search/SearchItem.cs
index 3f52be9ee..81d1d64d3 100644
--- a/Source/Editor/Surface/ContextMenu/SearchItem.cs
+++ b/Source/Editor/Windows/Search/SearchItem.cs
@@ -2,11 +2,10 @@
 
 using FlaxEditor.Content;
 using FlaxEditor.GUI.ContextMenu;
-using FlaxEditor.Windows;
 using FlaxEngine;
 using FlaxEngine.GUI;
 
-namespace FlaxEditor.Surface.ContextMenu
+namespace FlaxEditor.Windows.Search
 {
     /// <summary>
     /// The <see cref="ContentFinder"/> item.
@@ -116,7 +115,7 @@ namespace FlaxEditor.Surface.ContextMenu
     /// <summary>
     /// The <see cref="SearchItem"/> for assets. Supports using asset thumbnail.
     /// </summary>
-    /// <seealso cref="FlaxEditor.Surface.ContextMenu.SearchItem" />
+    /// <seealso cref="FlaxEditor.Windows.Search.SearchItem" />
     /// <seealso cref="FlaxEditor.Content.IContentItemOwner" />
     public class AssetSearchItem : SearchItem, IContentItemOwner
     {