diff --git a/client/components/main/globalSearch.jade b/client/components/main/globalSearch.jade
index d04d9045a..3dac5c9ef 100644
--- a/client/components/main/globalSearch.jade
+++ b/client/components/main/globalSearch.jade
@@ -14,7 +14,14 @@ template(name="globalSearch")
   if currentUser
     .wrapper
       form.global-search-instructions.js-search-query-form
-        input.global-search-query-input(type="text" name="searchQuery" placeholder="{{_ 'search-example'}}" value="{{ query.get }}" autofocus dir="auto")
+        input.global-search-query-input(
+          id="global-search-input"
+          type="text"
+          name="searchQuery"
+          placeholder="{{_ 'search-example'}}"
+          value="{{ query.get }}"
+          autofocus dir="auto"
+        )
       if searching.get
         +spinner
       else if hasResults.get
@@ -32,22 +39,22 @@ template(name="globalSearch")
               +resultCard(card)
       else
         .global-search-instructions
-          h2 Boards
+          h2 {{_ 'boards' }}
           .lists-wrapper
             each title in myBoardNames.get
               span.card-label.list-title.js-board-title
                 = title
-          h2 Lists
+          h2 {{_ 'lists' }}
           .lists-wrapper
             each title in myLists.get
               span.card-label.list-title.js-list-title
                 = title
-          h2 Label Colors
+          h2 {{_ 'label-colors' }}
           .palette-colors: each label in labelColors
             span.card-label.palette-color.js-label-color(class="card-label-{{label.color}}")
               = label.name
           if myLabelNames.get.length
-            h2 Label Names
+            h2 {{_ 'label-names' }}
             .lists-wrapper
               each name in myLabelNames.get
                 span.card-label.list-title.js-label-name
diff --git a/client/components/main/globalSearch.js b/client/components/main/globalSearch.js
index e274f671d..cfb698edc 100644
--- a/client/components/main/globalSearch.js
+++ b/client/components/main/globalSearch.js
@@ -401,6 +401,7 @@ BlazeComponent.extendComponent({
               evt.currentTarget.textContent
             }"`,
           );
+          document.getElementById('global-search-input').focus();
         },
         'click .js-board-title'(evt) {
           evt.preventDefault();
@@ -409,6 +410,7 @@ BlazeComponent.extendComponent({
               evt.currentTarget.textContent
             }"`,
           );
+          document.getElementById('global-search-input').focus();
         },
         'click .js-list-title'(evt) {
           evt.preventDefault();
@@ -417,6 +419,7 @@ BlazeComponent.extendComponent({
               evt.currentTarget.textContent
             }"`,
           );
+          document.getElementById('global-search-input').focus();
         },
         'click .js-label-name'(evt) {
           evt.preventDefault();
@@ -425,6 +428,7 @@ BlazeComponent.extendComponent({
               evt.currentTarget.textContent
             }"`,
           );
+          document.getElementById('global-search-input').focus();
         },
       },
     ];
diff --git a/client/components/main/globalSearch.styl b/client/components/main/globalSearch.styl
index 242b5156f..b982f4eed 100644
--- a/client/components/main/globalSearch.styl
+++ b/client/components/main/globalSearch.styl
@@ -78,6 +78,12 @@
   margin-left: auto
   line-height: 150%
 
+.global-search-instructions h1
+  margin-top: 2rem;
+
+.global-search-instructions h2
+  margin-top: 1rem;
+
 .global-search-query-input
   width: 90% !important
   margin-right: auto
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index b5d1df9c7..533b0fbb1 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -916,5 +916,7 @@
   "globalSearch-instructions-notes-5": "Currently archived cards are not searched.",
   "link-to-search": "Link to this search",
   "excel-font": "Arial",
-  "number": "Number"
+  "number": "Number",
+  "label-colors": "Label Colors",
+  "label-names": "Label Names"
 }