diff --git a/app/assets/javascripts/discourse/views/search-results-type.js.es6 b/app/assets/javascripts/discourse/views/search-results-type.js.es6
index b77d523c0d4..9f88257d829 100644
--- a/app/assets/javascripts/discourse/views/search-results-type.js.es6
+++ b/app/assets/javascripts/discourse/views/search-results-type.js.es6
@@ -3,7 +3,6 @@ export default Ember.CollectionView.extend({
   itemViewClass: Discourse.GroupedView.extend({
     tagName: 'li',
     classNameBindings: ['selected'],
-    templateName: Discourse.computed.fmt('parentView.type', "search/%@_result"),
-    selected: Discourse.computed.propertyEqual('content.index', 'controller.selectedIndex')
+    templateName: Discourse.computed.fmt('parentView.type', "search/%@_result")
   })
 });
diff --git a/app/assets/javascripts/discourse/views/search.js.es6 b/app/assets/javascripts/discourse/views/search.js.es6
index 115d6fe1f10..92490c1a7fa 100644
--- a/app/assets/javascripts/discourse/views/search.js.es6
+++ b/app/assets/javascripts/discourse/views/search.js.es6
@@ -3,27 +3,4 @@ export default Discourse.View.extend({
   classNames: ['d-dropdown'],
   elementId: 'search-dropdown',
   templateName: 'search'
-
-//  didInsertElement: function() {
-//    // Delegate ESC to the composer
-//    var controller = this.get('controller');
-//    return $('body').on('keydown.search', function(e) {
-//      if ($('#search-dropdown').is(':visible')) {
-//        switch (e.which) {
-//        case 13:
-//          controller.select();
-//          e.preventDefault();
-//          break;
-//        case 38:
-//          controller.moveUp();
-//          e.preventDefault();
-//          break;
-//        case 40:
-//          controller.moveDown();
-//          e.preventDefault();
-//          break;
-//        }
-//      }
-//    });
-//  }
 });