diff --git a/cms/djangoapps/contentstore/config/waffle.py b/cms/djangoapps/contentstore/config/waffle.py
index 45c6799d02..28d46e18b7 100644
--- a/cms/djangoapps/contentstore/config/waffle.py
+++ b/cms/djangoapps/contentstore/config/waffle.py
@@ -9,6 +9,7 @@ WAFFLE_NAMESPACE = u'studio'
 
 # Switches
 ENABLE_ACCESSIBILITY_POLICY_PAGE = u'enable_policy_page'
+ENABLE_ASSETS_SEARCH = u'enable_assets_search'
 
 
 def waffle():
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index d4ada8d55c..2b1c0a943e 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -6,6 +6,7 @@
   from django.utils.translation import ugettext as _
   from openedx.core.djangolib.markup import HTML, Text
   from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json
+  from cms.djangoapps.contentstore.config.waffle import waffle, ENABLE_ASSETS_SEARCH
 %>
 <%block name="title">${_("Files & Uploads")}</%block>
 <%block name="bodyclass">is-signedin course uploads view-uploads</%block>
@@ -82,6 +83,9 @@
                     },
                     "upload_settings": {
                         "max_file_size_in_mbs": ${max_file_size_in_mbs|n, dump_js_escaped_json}
+                    },
+                    "search_settings": {
+                        "enabled": ${waffle().is_enabled(ENABLE_ASSETS_SEARCH) | n, dump_js_escaped_json}
                     }
                 }
             </%static:studiofrontend>