diff --git a/_shared_assets/themes/owncloud_org/layout.html b/_shared_assets/themes/owncloud_org/layout.html
index 97dc69de1..252a51886 100644
--- a/_shared_assets/themes/owncloud_org/layout.html
+++ b/_shared_assets/themes/owncloud_org/layout.html
@@ -129,10 +129,12 @@
         <h1><a href="{{ pathto(master_doc) }}">{{ project|e }}</a></h1>
       </div>
       <div class="col-md-5 col-md-offset-1">
+      {% if theme_show_search %}
         <form class="headersearch" style="margin-bottom:-3px;" action="{{ pathto('search') }}" method="get">
         <input type="text" value="" name="q" id="q" class="form-control" />
         <button  class="btn btn-default" type="submit" id="searchsubmit">Search</button>
         </form>
+      {% endif %}
       </div>
     </div>
     {% block sidebartoc %}
diff --git a/_shared_assets/themes/owncloud_org/theme.conf b/_shared_assets/themes/owncloud_org/theme.conf
index 180ceac81..44eb42d65 100644
--- a/_shared_assets/themes/owncloud_org/theme.conf
+++ b/_shared_assets/themes/owncloud_org/theme.conf
@@ -56,3 +56,5 @@ bootswatch_theme = ""
 # Switch Bootstrap version?
 # Values: "3" (default) or "2"
 bootstrap_version = 3
+
+show_search = true