diff --git a/src/components/Editor/SearchBar.js b/src/components/Editor/SearchBar.js
index ff24ebb8a4..c7570d0c19 100644
--- a/src/components/Editor/SearchBar.js
+++ b/src/components/Editor/SearchBar.js
@@ -345,6 +345,7 @@ class SearchBar extends Component {
     const searchInput = this.searchInput();
     if (searchInput) {
       searchInput.setSelectionRange(0, searchInput.value.length);
+      searchInput.focus();
     }
   }