diff --git a/lib/gollum/frontend/templates/page.mustache b/lib/gollum/frontend/templates/page.mustache
index 87e70be4..5cff0b04 100644
--- a/lib/gollum/frontend/templates/page.mustache
+++ b/lib/gollum/frontend/templates/page.mustache
@@ -2,7 +2,7 @@
   <div class="main">
     <div class="actions">
       <form action="/search" method="get">
-        <a href="/">Home</a> | <a href="/edit/{{name}}">Edit</a> | <input type="text" name="q" size="10" /> <input type="submit" value="search" />
+        <a href="/">Home</a> | <a href="/edit/{{name}}">Edit</a> | <input type="search" name="q" size="10" /> <input type="submit" value="search" />
       </form>
     </div>
     <h1>{{title}}</h1>
diff --git a/lib/gollum/frontend/templates/search.mustache b/lib/gollum/frontend/templates/search.mustache
index 964452dc..bb086731 100644
--- a/lib/gollum/frontend/templates/search.mustache
+++ b/lib/gollum/frontend/templates/search.mustache
@@ -2,7 +2,7 @@
   <div class="main">
     <div class="actions">
       <form action="/search" method="get">
-        <a href="/">Home</a> | <input type="text" name="q" size="10" /> <input type="submit" value="search" />
+        <a href="/">Home</a> | <input type="search" name="q" size="10" /> <input type="submit" value="search" />
       </form>
     </div>
     <h1>Search for “{{search_string}}”</h1>