diff --git a/src/main/twirl/gitbucket/core/search/code.scala.html b/src/main/twirl/gitbucket/core/search/code.scala.html
index a89fa71..de5190f 100644
--- a/src/main/twirl/gitbucket/core/search/code.scala.html
+++ b/src/main/twirl/gitbucket/core/search/code.scala.html
@@ -6,9 +6,7 @@
 @import gitbucket.core.service.RepositorySearchService
 @gitbucket.core.html.main("Search Results", Some(repository)){
   @gitbucket.core.search.html.menu("code", query, repository){
-    @if(query.isEmpty) {
-      <h4>Input the search keyword</h4>
-    } else {
+    @if(query.nonEmpty) {
       @if(files.isEmpty) {
         <h4>We couldn't find any code matching '@query'</h4>
       } else {
diff --git a/src/main/twirl/gitbucket/core/search/issues.scala.html b/src/main/twirl/gitbucket/core/search/issues.scala.html
index 13e5da0..e72fa99 100644
--- a/src/main/twirl/gitbucket/core/search/issues.scala.html
+++ b/src/main/twirl/gitbucket/core/search/issues.scala.html
@@ -6,9 +6,7 @@
 @import gitbucket.core.service.RepositorySearchService
 @gitbucket.core.html.main("Search Results", Some(repository)){
   @gitbucket.core.search.html.menu("issue", query, repository){
-    @if(query.isEmpty){
-      <h4>Input the search keyword</h4>
-    } else {
+    @if(query.nonEmpty) {
       @if(issues.isEmpty) {
         <h4>We couldn't find any code matching '@query'</h4>
       } else {
diff --git a/src/main/twirl/gitbucket/core/search/menu.scala.html b/src/main/twirl/gitbucket/core/search/menu.scala.html
index 8b1d7eb..d280f17 100644
--- a/src/main/twirl/gitbucket/core/search/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/search/menu.scala.html
@@ -2,25 +2,13 @@
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @gitbucket.core.html.menu("", repository){
-  <ul class="nav nav-tabs" style="margin-bottom: 20px;">
-    <li@if(active=="code"){ class="active"}>
-      <a href="@helpers.url(repository)/search?q=@helpers.urlEncode(query)&type=code">
-        Files
-      </a>
-    </li>
-    <li@if(active=="issue"){ class="active"}>
-      <a href="@helpers.url(repository)/search?q=@helpers.urlEncode(query)&type=issue">
-        Issues
-      </a>
-    </li>
-    <li@if(active=="wiki"){ class="active"}>
-      <a href="@helpers.url(repository)/search?q=@helpers.urlEncode(query)&type=wiki">
-        Wiki
-      </a>
-    </li>
-  </ul>
   <form action="@helpers.url(repository)/search" method="GET" class="form-inline">
-    <input type="text" name="q" value="@query" class="form-control" style="width: 400px; margin-bottom: 0px;"/>
+    <select class="form-control" name="type">
+      <option value="code"  @if(active=="code" ){ selected }>Files</option>
+      <option value="issue" @if(active=="issue"){ selected }>Issues</option>
+      <option value="wiki"  @if(active=="wiki" ){ selected }>Wiki</option>
+    </select>
+    <input type="text" name="q" value="@query" class="form-control" style="width: 250px; margin-bottom: 0px;"/>
     <input type="submit" value="Search" class="btn btn-default"/>
     <input type="hidden" name="type" value="@active"/>
   </form>
diff --git a/src/main/twirl/gitbucket/core/search/wiki.scala.html b/src/main/twirl/gitbucket/core/search/wiki.scala.html
index be05a04..1f459d5 100644
--- a/src/main/twirl/gitbucket/core/search/wiki.scala.html
+++ b/src/main/twirl/gitbucket/core/search/wiki.scala.html
@@ -6,9 +6,7 @@
 @import gitbucket.core.service.RepositorySearchService
 @gitbucket.core.html.main("Search Results", Some(repository)){
   @gitbucket.core.search.html.menu("wiki", query, repository){
-    @if(query.isEmpty){
-      <h4>Input the search keyword</h4>
-    } else {
+    @if(query.nonEmpty) {
       @if(wikis.isEmpty) {
         <h4>We couldn't find any code matching '@query'</h4>
       } else {