diff --git a/src/content.scss b/src/content.scss
index 41e65a1..20137b9 100644
--- a/src/content.scss
+++ b/src/content.scss
@@ -423,15 +423,15 @@ $minimal-z-index: max($github-header-z-index, $github-pull-request-float-header-
           }
 
           .go-to-button {
-            display: none;
+            vertical-align: middle;
             white-space: nowrap;
             background: transparent;
             border: none;
             padding: 0;
           }
-          &:hover {
+          &:not(:hover) {
             .go-to-button {
-              display: inline-block;
+              display: none;
             }
           }
         }
diff --git a/src/utils/DOMHelper.ts b/src/utils/DOMHelper.ts
index 6da363e..442d6e1 100644
--- a/src/utils/DOMHelper.ts
+++ b/src/utils/DOMHelper.ts
@@ -98,7 +98,7 @@ export function focusFileExplorer() {
 }
 
 export function focusSearchInput() {
-  const searchInputSelector = '.search-input'
+  const searchInputSelector = '.search-input input'
   $(searchInputSelector, searchInputElement => {
     if (
       document.activeElement !== searchInputElement &&