diff --git a/OurUmbraco.Site/Views/Search/Search.aspx b/OurUmbraco.Site/Views/Search/Search.aspx
index 042c48ac..9e51210c 100644
--- a/OurUmbraco.Site/Views/Search/Search.aspx
+++ b/OurUmbraco.Site/Views/Search/Search.aspx
@@ -29,12 +29,10 @@
                         Time elapsed: <%=Model.Results.Totalmilliseconds %>
                     </p>
 
-                    <form action="/search">
-                        <div class="search-big">
-                            <input type="search" name="term" required value="<%=Model.Results.SearchTerm %>">
-                            <label for="search">Search</label>
-                        </div>
-                    </form>
+                    <div class="search-big">
+                        <asp:TextBox runat="server" ID="SearchText" ></asp:TextBox>
+                        <label for="<%=SearchText.ClientID %>">Search</label>
+                    </div>
 
                     <div class="clear"></div>
                 </div>
diff --git a/OurUmbraco.Site/Views/Search/Search.aspx.cs b/OurUmbraco.Site/Views/Search/Search.aspx.cs
index 7e8c5c65..7b093c0f 100644
--- a/OurUmbraco.Site/Views/Search/Search.aspx.cs
+++ b/OurUmbraco.Site/Views/Search/Search.aspx.cs
@@ -19,13 +19,23 @@ namespace OurUmbraco.Site.Views.Search
         {
             base.OnLoad(e);
 
-            var umbracoPage = UmbracoContext.PublishedContentRequest.PublishedContent;
+            if (!IsPostBack)
+            {
+                var umbracoPage = UmbracoContext.PublishedContentRequest.PublishedContent;
 
-            var ourSearcher = new OurSearcher(Request.QueryString["q"], maxResults: 100);
+                var ourSearcher = new OurSearcher(Request.QueryString["q"], maxResults: 100);
 
-            var results = ourSearcher.Search();
+                var results = ourSearcher.Search();
 
-            Model = new SearchResultContentModel(umbracoPage, results);
+                Model = new SearchResultContentModel(umbracoPage, results);
+
+                SearchText.Text = Model.Results.SearchTerm;
+            }
+            else
+            {
+                Response.Redirect("/search?q=" + SearchText.Text);
+            }
+            
         }
     }
 }
\ No newline at end of file
diff --git a/OurUmbraco.Site/Views/Search/Search.aspx.designer.cs b/OurUmbraco.Site/Views/Search/Search.aspx.designer.cs
index 4471701b..1181a1a5 100644
--- a/OurUmbraco.Site/Views/Search/Search.aspx.designer.cs
+++ b/OurUmbraco.Site/Views/Search/Search.aspx.designer.cs
@@ -3,15 +3,22 @@
 //     This code was generated by a tool.
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace OurUmbraco.Site.Views.Search
-{
-
-
-    public partial class Search
-    {
+namespace OurUmbraco.Site.Views.Search {
+    
+    
+    public partial class Search {
+        
+        /// <summary>
+        /// SearchText control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox SearchText;
     }
 }