diff --git a/app/assets/javascripts/discourse/templates/search/topic_result.js.handlebars b/app/assets/javascripts/discourse/templates/search/topic_result.js.handlebars
index 37d58aed426..6e2fd5aee65 100644
--- a/app/assets/javascripts/discourse/templates/search/topic_result.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/search/topic_result.js.handlebars
@@ -1,5 +1,5 @@
 {{#with view.content}}
-  <a href='{{unbound url}}'>   
+  <a href='{{unbound url}}'>
     {{unbound title}}
   </a>
 {{/with}}
diff --git a/app/assets/javascripts/discourse/views/search/search_view.js b/app/assets/javascripts/discourse/views/search/search_view.js
index f03f8767197..c51bb699102 100644
--- a/app/assets/javascripts/discourse/views/search/search_view.js
+++ b/app/assets/javascripts/discourse/views/search/search_view.js
@@ -18,12 +18,18 @@ Discourse.SearchView = Discourse.View.extend({
     return $('body').on('keydown.search', function(e) {
       if ($('#search-dropdown').is(':visible')) {
         switch (e.which) {
-          case 13:
-            return controller.select();
-          case 38:
-            return controller.moveUp();
-          case 40:
-            return controller.moveDown();
+        case 13:
+          controller.select();
+          e.preventDefault();
+          break;
+        case 38:
+          controller.moveUp();
+          e.preventDefault();
+          break;
+        case 40:
+          controller.moveDown();
+          e.preventDefault();
+          break;
         }
       }
     });