diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/LayerPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/LayerPartHandler.cs
new file mode 100644
index 000000000..ff93244c2
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/LayerPartHandler.cs
@@ -0,0 +1,13 @@
+using JetBrains.Annotations;
+using Orchard.ContentManagement.Handlers;
+using Orchard.Data;
+using Orchard.Widgets.Models;
+
+namespace Orchard.Widgets.Handlers {
+    [UsedImplicitly]
+    public class LayerPartHandler : ContentHandler {
+        public LayerPartHandler(IRepository<LayerPartRecord> layersRepository) {
+            Filters.Add(StorageFilter.For(layersRepository));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/WidgetPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/WidgetPartHandler.cs
new file mode 100644
index 000000000..ccfbaee8f
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/WidgetPartHandler.cs
@@ -0,0 +1,13 @@
+using JetBrains.Annotations;
+using Orchard.ContentManagement.Handlers;
+using Orchard.Data;
+using Orchard.Widgets.Models;
+
+namespace Orchard.Widgets.Handlers {
+    [UsedImplicitly]
+    public class WidgetPartHandler : ContentHandler {
+        public WidgetPartHandler(IRepository<WidgetPartRecord> widgetsRepository) {
+            Filters.Add(StorageFilter.For(widgetsRepository));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
index 6db38d860..748100819 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
@@ -59,6 +59,8 @@
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="Handlers\LayerPartHandler.cs" />
+    <Compile Include="Handlers\WidgetPartHandler.cs" />
     <Compile Include="Models\Layer.cs" />
     <Compile Include="Models\LayerPart.cs" />
     <Compile Include="Models\LayerPartRecord.cs" />
@@ -78,7 +80,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
-    <Folder Include="Handlers\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Core\Orchard.Core.csproj">