diff --git a/src/components/DocSearch/index.js b/src/components/DocSearch/index.js
deleted file mode 100644
index 8e2a0ad3..00000000
--- a/src/components/DocSearch/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Copyright (c) 2013-present, Facebook, Inc.
- *
- * @emails react-core
- */
-
-'use strict';
-
-import DocSearch from './DocSearch';
-
-export default DocSearch;
diff --git a/src/components/DocSearch/DocSearch.js b/src/components/LayoutHeader/DocSearch.js
similarity index 92%
rename from src/components/DocSearch/DocSearch.js
rename to src/components/LayoutHeader/DocSearch.js
index fc1475ab..8619e314 100644
--- a/src/components/DocSearch/DocSearch.js
+++ b/src/components/LayoutHeader/DocSearch.js
@@ -9,7 +9,7 @@ import {colors, media} from 'theme';
 
 class DocSearch extends Component {
   state = {
-    disabled: false,
+    enabled: true,
   };
   componentDidMount() {
     // Initialize Algolia search.
@@ -22,14 +22,15 @@ class DocSearch extends Component {
         inputSelector: '#algolia-doc-search',
       });
     } else {
-      this.setState({disabled: true});
+      console.warn('Search has failed to load and now is being disabled');
+      this.setState({enabled: false});
     }
   }
 
   render() {
-    const {disabled} = this.state;
+    const {enabled} = this.state;
 
-    return (
+    return enabled ? (
       <form
         css={{
           display: 'flex',
@@ -56,7 +57,6 @@ class DocSearch extends Component {
           },
         }}>
         <input
-          disabled={disabled}
           css={{
             appearance: 'none',
             background: 'transparent',
@@ -103,7 +103,7 @@ class DocSearch extends Component {
           aria-label="Search docs"
         />
       </form>
-    );
+    ) : null;
   }
 }
 
diff --git a/src/components/LayoutHeader/Header.js b/src/components/LayoutHeader/Header.js
index 8327a612..9b2d9560 100644
--- a/src/components/LayoutHeader/Header.js
+++ b/src/components/LayoutHeader/Header.js
@@ -13,7 +13,7 @@ import React from 'react';
 import {colors, fonts, media} from 'theme';
 import {version} from 'site-constants';
 import ExternalLinkSvg from 'templates/components/ExternalLinkSvg';
-import DocSearch from 'components/DocSearch';
+import DocSearch from './DocSearch';
 
 import logoSvg from 'icons/logo.svg';