diff --git a/src/main/scala/app/IndexController.scala b/src/main/scala/app/IndexController.scala
index d67b340..9b5f80c 100644
--- a/src/main/scala/app/IndexController.scala
+++ b/src/main/scala/app/IndexController.scala
@@ -41,7 +41,7 @@
 
   get("/:owner/:repository/search")(referrersOnly { repository =>
     val query  = params("q")
-    val target = params.getOrElse("type", "Code")
+    val target = params.getOrElse("type", "code")
 
     target.toLowerCase match {
       case "issue" => {
diff --git a/src/main/twirl/search/menu.scala.html b/src/main/twirl/search/menu.scala.html
index 500f874..842a274 100644
--- a/src/main/twirl/search/menu.scala.html
+++ b/src/main/twirl/search/menu.scala.html
@@ -7,15 +7,20 @@
     <div class="box">
       <ul class="nav nav-tabs nav-stacked side-menu">
         <li@if(active=="code"){ class="active"}>
-          <a href="@url(repository)/search?q=@urlEncode(query)&type=Code">Code</a>
+          <a href="@url(repository)/search?q=@urlEncode(query)&type=code">Code</a>
         </li>
         <li@if(active=="issue"){ class="active"}>
-          <a href="@url(repository)/search?q=@urlEncode(query)&type=Issue">Issue</a>
+          <a href="@url(repository)/search?q=@urlEncode(query)&type=issue">Issue</a>
         </li>
       </ul>
     </div>
   </div>
   <div class="span9">
+    <form action="@url(repository)/search" method="GET">
+      <input type="text" name="q" value="@query" style="width: 80%; margin-bottom: 0px;"/>
+      <input type="submit" value="Search" class="btn" style="width: 15%;"/>
+      <input type="hidden" name="type" value="@active"/>
+    </form>
     @body
   </div>
 </div>