diff --git a/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchFormPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchFormPartDriver.cs
index 26a78c124..aa09a6fc5 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchFormPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchFormPartDriver.cs
@@ -7,7 +7,13 @@ namespace Orchard.Search.Drivers {
 
         protected override DriverResult Display(SearchFormPart part, string displayType, dynamic shapeHelper) {
             var model = new SearchViewModel();
-            return ContentPartTemplate(model, "Parts/Search.SearchForm");
+            return ContentShape("Parts_Search_SearchForm", "Content:1",
+                                () => {
+                                    var shape = shapeHelper.Parts_Search_SearchForm();
+                                    shape.ContentPart = part;
+                                    shape.ViewModel = model;
+                                    return shape;
+                                });
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
index e0e430aeb..c9f772b90 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
@@ -101,11 +101,10 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\EditorTemplates\Parts\Search.SiteSettings.cshtml" />
-    <Content Include="Views\EditorTemplates\Parts\Search.SearchForm.cshtml" />
     <Content Include="Views\Search\Index.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\DisplayTemplates\Parts\Search.SearchForm.cshtml" />
+    <Content Include="Views\Parts\Search.SearchForm.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SearchForm.cshtml b/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SearchForm.cshtml
deleted file mode 100644
index 5f282702b..000000000
--- a/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SearchForm.cshtml
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/DisplayTemplates/Parts/Search.SearchForm.cshtml b/src/Orchard.Web/Modules/Orchard.Search/Views/Parts/Search.SearchForm.cshtml
similarity index 64%
rename from src/Orchard.Web/Modules/Orchard.Search/Views/DisplayTemplates/Parts/Search.SearchForm.cshtml
rename to src/Orchard.Web/Modules/Orchard.Search/Views/Parts/Search.SearchForm.cshtml
index bd3b849fa..6fd978460 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Views/DisplayTemplates/Parts/Search.SearchForm.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Parts/Search.SearchForm.cshtml
@@ -1,8 +1,8 @@
-@model Orchard.Search.ViewModels.SearchViewModel
+@using Orchard.Search.ViewModels;
 
 @using(Html.BeginForm("index", "search", new { area = "Orchard.Search" }, FormMethod.Get, new { @class = "search" })) { 
     <fieldset>
-        @Html.TextBox("q", Model.Query)
+        @Html.TextBox("q", (SearchViewModel)Model.ViewModel.Query)
         <button type="submit">@T("Search")</button>
     </fieldset>
-} 
+}
\ No newline at end of file