diff --git a/src/Orchard/Mvc/OrchardControllerIdentificationStrategy.cs b/src/Orchard/Mvc/OrchardControllerIdentificationStrategy.cs
index 924371922..b7115f86e 100644
--- a/src/Orchard/Mvc/OrchardControllerIdentificationStrategy.cs
+++ b/src/Orchard/Mvc/OrchardControllerIdentificationStrategy.cs
@@ -29,6 +29,11 @@ namespace Orchard.Mvc {
 
                 areaName = controllerNamespace.Split('.').Skip(2).FirstOrDefault();
             }
+            else if (assemblySimpleName == "Orchard.Web" &&
+                controllerNamespace.StartsWith("Orchard.Web.Areas.")) {
+
+                areaName = controllerNamespace.Split('.').Skip(3).FirstOrDefault();
+            }
             else if (extension != null) {
                 areaName = extension.Descriptor.Name;
             }
diff --git a/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs b/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs
index 7d6fdb526..8d47c2155 100644
--- a/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs
+++ b/src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs
@@ -53,7 +53,7 @@ namespace Orchard.Mvc.ViewEngines {
 
 
             var modules = _extensionManager.ActiveExtensions()
-                .Where(x => x.Descriptor.ExtensionType == "Module");
+                .Where(x => x.Descriptor.ExtensionType == "Module" || x.Descriptor.ExtensionType == "Area");
 
             var moduleLocations = modules.Select(x => Path.Combine(x.Descriptor.Location, x.Descriptor.Name));
             var moduleViewEngines = _viewEngineProviders