diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index 5993d537b6..8b1f7aa74f 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -117,6 +117,7 @@ var people_list = [
                       <div id="global_filters">
                           {# Special-case this link so we don't actually go to page top. #}
                           <li data-name="home" class="active-filter"><a href="#" onclick="ui.change_tab_to('#home');narrow.deactivate();return false" >Home <span class="count">(<span class="value"></span>)</span></a></li>
+                          <li data-name="all"><a href="#narrow/in/all">All messages <span class="count">(<span class="value"></span>)</span></a></li>
                           <li data-name="private" ><a href="#narrow/is/private-message">All private messages <span class="count">(<span class="value"></span>)</span></a></li>
                       </div>
                       <hr id="stream_filters_sep">
diff --git a/zephyr/static/js/narrow.js b/zephyr/static/js/narrow.js
index 6eb656e359..86918c309a 100644
--- a/zephyr/static/js/narrow.js
+++ b/zephyr/static/js/narrow.js
@@ -257,7 +257,9 @@ exports.activate = function (operators, opts) {
 
     $("ul.filters li").removeClass('active-filter');
     if (operators.length === 1) {
-        if (operators[0][0] === "stream") {
+        if (operators[0][0] === 'in' && operators[0][1] === 'all') {
+            $('#filtall').addClass('active-filter');
+        } else if (operators[0][0] === "stream") {
             $("#stream_filters li[data-name='" + encodeURIComponent(operators[0][1]) + "']").addClass('active-filter');
         } else if (operators[0][0] === "is" && operators[0][1] === "private-message") {
             $("#filtpers").addClass('active-filter');