diff --git a/assets/js/all.js b/assets/js/all.js
index 8f0ae40..5eb835f 100644
--- a/assets/js/all.js
+++ b/assets/js/all.js
@@ -971,7 +971,8 @@ Miniflux.Nav = (function() {
         },
         ShowSearch: function() {
             document.getElementById("search-opener").setAttribute("class", "hide");
-            document.getElementById("search-form").removeAttribute("class")
+            document.getElementById("search-form").removeAttribute("class");
+            document.getElementById("form-text").focus();
         },
         IsListing: isListing
     };
diff --git a/assets/js/nav.js b/assets/js/nav.js
index 03e4d26..c4454e7 100644
--- a/assets/js/nav.js
+++ b/assets/js/nav.js
@@ -109,7 +109,8 @@ Miniflux.Nav = (function() {
         },
         ShowSearch: function() {
             document.getElementById("search-opener").setAttribute("class", "hide");
-            document.getElementById("search-form").removeAttribute("class")
+            document.getElementById("search-form").removeAttribute("class");
+            document.getElementById("form-text").focus();
         },
         IsListing: isListing
     };