diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index 19582a5d4..bb1bc4e7b 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -131,7 +131,6 @@
     <Compile Include="Settings\Permissions.cs" />
     <Compile Include="Themes\Preview\IPreviewTheme.cs" />
     <Compile Include="Themes\Preview\PreviewThemeFilter.cs" />
-    <Compile Include="Themes\Services\AdminThemeSelector.cs" />
     <Compile Include="Themes\Preview\PreviewTheme.cs" />
     <Compile Include="Themes\Services\SafeModeThemeSelector.cs" />
     <Compile Include="Settings\AdminMenu.cs" />
diff --git a/src/Orchard/Orchard.csproj b/src/Orchard/Orchard.csproj
index a68682cc9..f1a9b3760 100644
--- a/src/Orchard/Orchard.csproj
+++ b/src/Orchard/Orchard.csproj
@@ -287,6 +287,7 @@
     <Compile Include="Mvc\ViewEngines\WebFormsViewEngineProvider.cs" />
     <Compile Include="Mvc\ViewModels\AdminViewModel.cs" />
     <Compile Include="Mvc\ViewModels\BaseViewModel.cs" />
+    <Compile Include="UI\Admin\AdminThemeSelector.cs" />
     <Compile Include="UI\Navigation\INavigationManager.cs" />
     <Compile Include="UI\Navigation\NavigationItemBuilder.cs" />
     <Compile Include="UI\PageClass\IPageClassBuilder.cs" />
diff --git a/src/Orchard.Web/Core/Themes/Services/AdminThemeSelector.cs b/src/Orchard/UI/Admin/AdminThemeSelector.cs
similarity index 92%
rename from src/Orchard.Web/Core/Themes/Services/AdminThemeSelector.cs
rename to src/Orchard/UI/Admin/AdminThemeSelector.cs
index 30a65cc46..63f58622d 100644
--- a/src/Orchard.Web/Core/Themes/Services/AdminThemeSelector.cs
+++ b/src/Orchard/UI/Admin/AdminThemeSelector.cs
@@ -4,7 +4,7 @@ using System.Web.Routing;
 using Orchard.Settings;
 using Orchard.Themes;
 
-namespace Orchard.Core.Themes.Services {
+namespace Orchard.UI.Admin {
     public class AdminThemeSelector : IThemeSelector {
         private readonly ISiteService _siteService;
 
@@ -21,4 +21,4 @@ namespace Orchard.Core.Themes.Services {
             return new ThemeSelectorResult { Priority = 100, ThemeName = "TheAdmin" };
         }
     }
-}
+}
\ No newline at end of file