diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
index 0824990e5a7..b2b612a422a 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6
@@ -1,11 +1,25 @@
 import DiscourseController from 'discourse/controllers/controller';
 
 export default DiscourseController.extend({
+  needs: ['discovery', 'discovery/topics'],
   categories: function() {
     return Discourse.Category.list();
   }.property(),
 
   navItems: function() {
-    return Discourse.NavItem.buildList();
-  }.property()
+    return Discourse.NavItem.buildList(null, {filterMode: this.get('filterMode')});
+  }.property('filterMode'),
+
+  isSearch: Em.computed.equal('filterMode', 'search'),
+
+  searchTerm: Em.computed.alias('controllers.discovery/topics.model.params.search'),
+
+  actions: {
+    search: function(){
+      var discovery = this.get('controllers.discovery/topics');
+      var model = discovery.get('model');
+      discovery.set('search', this.get("searchTerm"));
+      model.refreshSort();
+    }
+  }
 });
diff --git a/app/assets/javascripts/discourse/models/nav_item.js b/app/assets/javascripts/discourse/models/nav_item.js
index c081fbcd2f8..41280548f76 100644
--- a/app/assets/javascripts/discourse/models/nav_item.js
+++ b/app/assets/javascripts/discourse/models/nav_item.js
@@ -84,7 +84,15 @@ Discourse.NavItem.reopenClass({
     args = args || {};
     if (category) { args.category = category }
 
-    return Discourse.SiteSettings.top_menu.split("|").map(function(i) {
+    var items = Discourse.SiteSettings.top_menu.split("|");
+
+    if (args.filterMode && !_.some(items, function(i){
+      return i.indexOf(args.filterMode) !== -1;
+    })) {
+      items.push(args.filterMode);
+    }
+
+    return items.map(function(i) {
       return Discourse.NavItem.fromText(i, args);
     }).filter(function(i) {
       return i !== null && !(category && i.get("name").indexOf("categor") === 0);
diff --git a/app/assets/javascripts/discourse/models/topic_list.js b/app/assets/javascripts/discourse/models/topic_list.js
index 01e3f12697c..2b970d94369 100644
--- a/app/assets/javascripts/discourse/models/topic_list.js
+++ b/app/assets/javascripts/discourse/models/topic_list.js
@@ -41,8 +41,8 @@ Discourse.TopicList = Discourse.Model.extend({
     var self = this,
         params = this.get('params');
 
-    params.order = order;
-    params.ascending = ascending;
+    params.order = order || params.order;
+    params.ascending = ascending || params.ascending || true;
 
     this.set('loaded', false);
     var finder = finderFor(this.get('filter'), params);
diff --git a/app/assets/javascripts/discourse/templates/navigation/default.hbs b/app/assets/javascripts/discourse/templates/navigation/default.hbs
index bd3015d44a6..d95de6b0435 100644
--- a/app/assets/javascripts/discourse/templates/navigation/default.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/default.hbs
@@ -1,3 +1,9 @@
+{{#if isSearch}}
+<div class="search row">
+  {{input type="text" value=searchTerm class="input-xxlarge search" action="search"}}
+  <button {{action "search"}} class="btn btn-primary"><i class='fa fa-search'></i></button>
+</div>
+{{else}}
 {{bread-crumbs categories=categories}}
 
 <ul class="nav nav-pills" id='navigation-bar'>
@@ -10,3 +16,4 @@
 {{#if canCreateTopic}}
   <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n 'topic.create'}}</button>
 {{/if}}
+{{/if}}
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 08a96e10ec9..fe31a13d16c 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -19,6 +19,11 @@
     font-weight: normal;
   }
 
+  .search .btn {
+    float: none;
+  }
+
+
   a.badge-category {
     padding: 3px 12px;
     font-size: 1.143em;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 4d6f0a1c424..7c3e3a40438 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -867,6 +867,7 @@ en:
         category: "There are no more {{category}} topics."
         top: "There are no more top topics."
         bookmarks: "There are no more bookmarked topics."
+        search: "There are no more search results."
 
     topic:
       filter_to: "{{post_count}} posts in topic"
@@ -1497,6 +1498,9 @@ en:
       read:
         title: "Read"
         help: "topics you've read, in the order that you last read them"
+      search:
+        title: "Search"
+        help: "search all topics"
       categories:
         title: "Categories"
         title_in: "Category - {{categoryName}}"
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 3c42c12ea15..f9aabf738d2 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -56,7 +56,7 @@ module Discourse
   class CSRF < StandardError; end
 
   def self.filters
-    @filters ||= [:latest, :unread, :new, :read, :posted, :bookmarks]
+    @filters ||= [:latest, :unread, :new, :read, :posted, :bookmarks, :search]
   end
 
   def self.feed_filters
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index f710f351c9f..4d0ba83c16d 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -70,6 +70,10 @@ class TopicQuery
     create_list(:latest, {}, latest_results)
   end
 
+  def list_search
+    create_list(:latest, {}, latest_results)
+  end
+
   def list_read
     create_list(:read, unordered: true) do |topics|
       topics.order('COALESCE(tu.last_visited_at, topics.bumped_at) DESC')