diff --git a/app/js/header.coffee b/app/js/header.coffee
index 464cd34..3f906e2 100644
--- a/app/js/header.coffee
+++ b/app/js/header.coffee
@@ -131,6 +131,7 @@ class App.Header extends Backbone.View
     # Allow users to use ctrl+shift+p or cmd+shift+p to focus search
     window.keymaster('command+shift+p, ctrl+shift+p', (e) =>
       @$search.focus()
+      e.preventDefault()
     )
 
     window.keymaster('enter', 'search', (e) =>
diff --git a/app/templates/partials/header.handlebars b/app/templates/partials/header.handlebars
index e93d1f3..5f9aadb 100644
--- a/app/templates/partials/header.handlebars
+++ b/app/templates/partials/header.handlebars
@@ -125,7 +125,7 @@
                     </div>
 
                     <form action="/search" method="get">
-                        <input id="search" type="text" placeholder="Search" name="terms" value="{{terms}}">
+                        <input id="search" type="text" placeholder="Search" name="terms" value="{{terms}}" tabindex="0">
                         <span class="help">
                             <span class="keys">ctrl+shift+p</span>
                             <span class="terms">