diff --git a/src/lib/DocSearch.js b/src/lib/DocSearch.js
index 15640162..f8ad036f 100644
--- a/src/lib/DocSearch.js
+++ b/src/lib/DocSearch.js
@@ -70,8 +70,7 @@ class DocSearch {
     this.client.addAlgoliaAgent('docsearch.js ' + version);
 
     if (enhancedSearchInput) {
-      DocSearch.injectSearchBox(this.input);
-      this.input = DocSearch.getInputFromSelector('#docsearch');
+      this.input = DocSearch.injectSearchBox(this.input);
     }
 
     this.autocomplete = autocomplete(this.input, autocompleteOptions, [{
@@ -114,7 +113,10 @@ class DocSearch {
 
   static injectSearchBox(input) {
     input.before(templates.searchBox);
+    var new_input = input.prev().prev().find('input');
     input.remove();
+
+    return new_input;
   }
 
   static bindSearchBoxEvent() {