diff --git a/deluge/ui/webui/config_tabs_webui.py b/deluge/ui/webui/config_tabs_webui.py
index 66472c4e5..508b7a932 100644
--- a/deluge/ui/webui/config_tabs_webui.py
+++ b/deluge/ui/webui/config_tabs_webui.py
@@ -93,6 +93,7 @@ class Sidebar(config_forms.WebCfgForm):
     title = _("Sidebar")
     sidebar_show_zero = forms.CheckBox(_("Show zero hits"))
     sidebar_show_trackers  = forms.CheckBox(_("Show trackers"))
+    show_keyword_search = forms.CheckBox(_("Show keyword search"))
 
 config_page.register('webui','template', Template)
 config_page.register('webui','server',Server)
diff --git a/deluge/ui/webui/templates/white/part_label_filters.html b/deluge/ui/webui/templates/white/part_label_filters.html
index 9abd169eb..1a59d4be8 100644
--- a/deluge/ui/webui/templates/white/part_label_filters.html
+++ b/deluge/ui/webui/templates/white/part_label_filters.html
@@ -6,19 +6,20 @@ $def with (filter_items)
 <input type="hidden" name="filter_cat" value="keyword">
 <div id="organize_block">
 <div id="organize_state">
-<div class="title">$_('Keyword')</div>
-<input type="text" name="filter_value" id="filter_value"
-$if get('filter_cat') == "keyword":
-    value="$get('filter_value')"
-style="width:100px;padding:0px" title="$_('Filter on a keyword')"/>
 
-$if get('filter_cat') == "keyword":
-    $if get('filter_value'):
-        <img src="$base/static/images/tango/edit-clear.png" alt="$_('Clear')"
-        onclick="el('keyword').value='';el('category_form').submit();"
-        >
-</form>
-<br /><br />
+$if get_config("show_keyword_search"):
+    <div class="title">$_('Keyword')</div>
+    <input type="text" name="filter_value" id="filter_value"
+    $if get('filter_cat') == "keyword":
+        value="$get('filter_value')"
+    style="width:100px;padding:0px" title="$_('Filter on a keyword')"/>
+    $if get('filter_cat') == "keyword":
+        $if get('filter_value'):
+            <img src="$base/static/images/tango/edit-clear.png" alt="$_('Clear')"
+            onclick="el('keyword').value='';el('category_form').submit();"
+            >
+    </form>
+    <br /><br />
 
 <!--
 $filter_items
diff --git a/deluge/ui/webui/webserver_common.py b/deluge/ui/webui/webserver_common.py
index 70aa9f5e4..cb5024224 100644
--- a/deluge/ui/webui/webserver_common.py
+++ b/deluge/ui/webui/webserver_common.py
@@ -63,5 +63,6 @@ CONFIG_DEFAULTS = {
     "disallow":{},
     "sessions":[],
     "sidebar_show_zero":False,
-    "sidebar_show_trackers":False
+    "sidebar_show_trackers":False,
+    "show_keyword_search":False
 }