diff --git a/src/main/scala/gitbucket/core/controller/IndexController.scala b/src/main/scala/gitbucket/core/controller/IndexController.scala
index 9c25fd0..2ef0490 100644
--- a/src/main/scala/gitbucket/core/controller/IndexController.scala
+++ b/src/main/scala/gitbucket/core/controller/IndexController.scala
@@ -138,7 +138,7 @@
   // TODO Move to RepositoryViwerController?
   get("/:owner/:repository/search")(referrersOnly { repository =>
     defining(params("q").trim, params.getOrElse("type", "code")){ case (query, target) =>
-      val page   = try {
+      val page = try {
         val i = params.getOrElse("page", "1").toInt
         if(i <= 0) 1 else i
       } catch {
@@ -147,21 +147,15 @@
 
       target.toLowerCase match {
         case "issue" => gitbucket.core.search.html.issues(
-          countFiles(repository.owner, repository.name, query),
-          searchIssues(repository.owner, repository.name, query),
-          countWikiPages(repository.owner, repository.name, query),
+          if(query.nonEmpty) searchIssues(repository.owner, repository.name, query) else Nil,
           query, page, repository)
 
         case "wiki" => gitbucket.core.search.html.wiki(
-          countFiles(repository.owner, repository.name, query),
-          countIssues(repository.owner, repository.name, query),
-          searchWikiPages(repository.owner, repository.name, query),
+          if(query.nonEmpty) searchWikiPages(repository.owner, repository.name, query) else Nil,
           query, page, repository)
 
         case _ => gitbucket.core.search.html.code(
-          searchFiles(repository.owner, repository.name, query),
-          countIssues(repository.owner, repository.name, query),
-          countWikiPages(repository.owner, repository.name, query),
+          if(query.nonEmpty) searchFiles(repository.owner, repository.name, query) else Nil,
           query, page, repository)
       }
     }
diff --git a/src/main/twirl/gitbucket/core/search/code.scala.html b/src/main/twirl/gitbucket/core/search/code.scala.html
index 0b6293c..de5190f 100644
--- a/src/main/twirl/gitbucket/core/search/code.scala.html
+++ b/src/main/twirl/gitbucket/core/search/code.scala.html
@@ -1,17 +1,17 @@
 @(files: List[gitbucket.core.service.RepositorySearchService.FileSearchResult],
-  issueCount: Int,
-  wikiCount: Int,
   query: String,
   page: Int,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @import gitbucket.core.service.RepositorySearchService
 @gitbucket.core.html.main("Search Results", Some(repository)){
-  @gitbucket.core.search.html.menu("code", files.size, issueCount, wikiCount, query, repository){
-    @if(files.isEmpty){
-      <h4>We couldn't find any code matching '@query'</h4>
-    } else {
-      <h4>We've found @files.size code @helpers.plural(files.size, "result")</h4>
+  @gitbucket.core.search.html.menu("code", query, repository){
+    @if(query.nonEmpty) {
+      @if(files.isEmpty) {
+        <h4>We couldn't find any code matching '@query'</h4>
+      } else {
+        <h4>We've found @files.size code @helpers.plural(files.size, "result")</h4>
+      }
     }
     @files.drop((page - 1) * RepositorySearchService.CodeLimit).take(RepositorySearchService.CodeLimit).map { file =>
       <div>
diff --git a/src/main/twirl/gitbucket/core/search/issues.scala.html b/src/main/twirl/gitbucket/core/search/issues.scala.html
index 06e05c3..e72fa99 100644
--- a/src/main/twirl/gitbucket/core/search/issues.scala.html
+++ b/src/main/twirl/gitbucket/core/search/issues.scala.html
@@ -1,17 +1,17 @@
-@(fileCount: Int,
-  issues: List[gitbucket.core.service.RepositorySearchService.IssueSearchResult],
-  wikiCount: Int,
+@(issues: List[gitbucket.core.service.RepositorySearchService.IssueSearchResult],
   query: String,
   page: Int,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @import gitbucket.core.service.RepositorySearchService
 @gitbucket.core.html.main("Search Results", Some(repository)){
-  @gitbucket.core.search.html.menu("issue", fileCount, issues.size, wikiCount, query, repository){
-    @if(issues.isEmpty){
-      <h4>We couldn't find any code matching '@query'</h4>
-    } else {
-      <h4>We've found @issues.size code @helpers.plural(issues.size, "result")</h4>
+  @gitbucket.core.search.html.menu("issue", query, repository){
+    @if(query.nonEmpty) {
+      @if(issues.isEmpty) {
+        <h4>We couldn't find any code matching '@query'</h4>
+      } else {
+        <h4>We've found @issues.size code @helpers.plural(issues.size, "result")</h4>
+      }
     }
     @issues.drop((page - 1) * RepositorySearchService.IssueLimit).take(RepositorySearchService.IssueLimit).map { issue =>
       <div class="block">
diff --git a/src/main/twirl/gitbucket/core/search/menu.scala.html b/src/main/twirl/gitbucket/core/search/menu.scala.html
index 5a946ab..d280f17 100644
--- a/src/main/twirl/gitbucket/core/search/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/search/menu.scala.html
@@ -1,35 +1,14 @@
-@(active: String, fileCount: Int, issueCount: Int, wikiCount: Int, query: String,
+@(active: String, query: String,
   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
-        @if(fileCount != 0){
-          <span class="badge">@fileCount</span>
-        }
-      </a>
-    </li>
-    <li@if(active=="issue"){ class="active"}>
-      <a href="@helpers.url(repository)/search?q=@helpers.urlEncode(query)&type=issue">
-        Issues
-        @if(issueCount != 0){
-          <span class="badge">@issueCount</span>
-        }
-      </a>
-    </li>
-    <li@if(active=="wiki"){ class="active"}>
-      <a href="@helpers.url(repository)/search?q=@helpers.urlEncode(query)&type=wiki">
-        Wiki
-        @if(wikiCount != 0){
-          <span class="badge">@wikiCount</span>
-        }
-      </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 e423b44..1f459d5 100644
--- a/src/main/twirl/gitbucket/core/search/wiki.scala.html
+++ b/src/main/twirl/gitbucket/core/search/wiki.scala.html
@@ -1,17 +1,17 @@
-@(fileCount: Int,
-  issueCount: Int,
-  wikis: List[gitbucket.core.service.RepositorySearchService.FileSearchResult],
+@(wikis: List[gitbucket.core.service.RepositorySearchService.FileSearchResult],
   query: String,
   page: Int,
   repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.core.view.helpers
 @import gitbucket.core.service.RepositorySearchService
 @gitbucket.core.html.main("Search Results", Some(repository)){
-  @gitbucket.core.search.html.menu("wiki", fileCount, issueCount, wikis.size, query, repository){
-    @if(wikis.isEmpty){
-      <h4>We couldn't find any code matching '@query'</h4>
-    } else {
-      <h4>We've found @wikis.size code @helpers.plural(wikis.size, "result")</h4>
+  @gitbucket.core.search.html.menu("wiki", query, repository){
+    @if(query.nonEmpty) {
+      @if(wikis.isEmpty) {
+        <h4>We couldn't find any code matching '@query'</h4>
+      } else {
+        <h4>We've found @wikis.size code @helpers.plural(wikis.size, "result")</h4>
+      }
     }
     @wikis.drop((page - 1) * RepositorySearchService.CodeLimit).take(RepositorySearchService.CodeLimit).map { file =>
       <div>