diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Drivers/DisableThemePartDriver.cs b/src/Orchard.Web/Modules/Orchard.Themes/Drivers/DisableThemePartDriver.cs
index ec9330e9f..f726b36de 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Drivers/DisableThemePartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Drivers/DisableThemePartDriver.cs
@@ -1,7 +1,8 @@
-using System.Web;
+using System.Web;
 using JetBrains.Annotations;
 using Orchard.ContentManagement.Drivers;
 using Orchard.Themes.Models;
+using Orchard.UI.Admin;
 
 namespace Orchard.Themes.Drivers {
     [UsedImplicitly]
@@ -13,6 +14,9 @@ namespace Orchard.Themes.Drivers {
         }
 
         protected override DriverResult Display(DisableThemePart part, string displayType, dynamic shapeHelper) {
+            if (AdminFilter.IsApplied(_httpContext.Request.RequestContext)) {
+                return null;
+            }
             return ContentShape("Parts_DisableTheme", () => {
                 ThemeFilter.Disable(_httpContext.Request.RequestContext);
                 return null;
@@ -20,4 +24,4 @@ namespace Orchard.Themes.Drivers {
         }
     }
 
-}
\ No newline at end of file
+}