diff --git a/zephyr/static/js/hashchange.js b/zephyr/static/js/hashchange.js
index a1a536d429..7e4bf29640 100644
--- a/zephyr/static/js/hashchange.js
+++ b/zephyr/static/js/hashchange.js
@@ -53,14 +53,8 @@ function parse_narrow(hash) {
         var operand  = decodeHashComponent(hash[i+1] || '');
         operators.push([operator, operand]);
     }
-    var new_selection;
-    if (current_msg_list.selected_id() !== -1) {
-        new_selection = current_msg_list.selected_id();
-    } else {
-        new_selection = page_params.initial_pointer;
-    }
     narrow.activate(operators, {
-        then_select_id: new_selection,
+        select_first_unread: true,
         change_hash:    false  // already set
     });
 }
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index b6ed7d7c10..5f3c246f7b 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -985,13 +985,6 @@ $(function () {
         compose.start('private', {private_message_recipient: email});
         e.preventDefault();
     });
-
-    $('#stream_filters li').on('click', 'a', function (e) {
-        var stream = $(e.target).parents('li').data('name');
-        narrow.by('stream', stream, {select_first_unread: true});
-
-        e.preventDefault();
-    });
 });
 
 function sort_narrow_list() {