diff --git a/deluge/ui/webui/templates/classic/header.html b/deluge/ui/webui/templates/classic/header.html
index 3ed682314..8cc960e70 100644
--- a/deluge/ui/webui/templates/classic/header.html
+++ b/deluge/ui/webui/templates/classic/header.html
@@ -38,6 +38,7 @@ $for id, title, url in admin_pages:
     href='$base$url'>$title</a>
 <a href="http://dev.deluge-torrent.org/wiki/Faq">Faq</a>
 
+
 </div>
             <div id="main_content">
                 <div id="main">
diff --git a/deluge/ui/webui/templates/classic/part_label_filters.html b/deluge/ui/webui/templates/classic/part_label_filters.html
index cfffeac3a..85708d5e8 100644
--- a/deluge/ui/webui/templates/classic/part_label_filters.html
+++ b/deluge/ui/webui/templates/classic/part_label_filters.html
@@ -31,6 +31,30 @@ $for cat in filter_items.keys():
         $else:
             $value ($count)</a>
         </li>
+
+
+<!--keyword search-->
+$if get_config("show_keyword_search"):
+    <br> <span class="title">$_("Search"):</span>
+    <form method="GET" id="category_form" style="display:inline" action="$base/index">
+    <input type="hidden" name="sort" value="$get('sort')">
+    <input type="hidden" name="order" value="$get('order')">
+    <input type="hidden" name="filter_cat" value="keyword">
+    <input type="text" name="filter_value" id="filter_value" title="test hover"
+    $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>
+
 </div>
 
 
+
+
diff --git a/deluge/ui/webui/templates/white/part_label_filters.html b/deluge/ui/webui/templates/white/part_label_filters.html
index 1a59d4be8..6e86b3f46 100644
--- a/deluge/ui/webui/templates/white/part_label_filters.html
+++ b/deluge/ui/webui/templates/white/part_label_filters.html
@@ -1,13 +1,14 @@
 $def with (filter_items)
 
-<form method="GET" id="category_form">
-<input type="hidden" name="sort" value="$get('sort')">
-<input type="hidden" name="order" value="$get('order')">
-<input type="hidden" name="filter_cat" value="keyword">
+
 <div id="organize_block">
 <div id="organize_state">
 
 $if get_config("show_keyword_search"):
+    <form method="GET" id="category_form">
+    <input type="hidden" name="sort" value="$get('sort')">
+    <input type="hidden" name="order" value="$get('order')">
+    <input type="hidden" name="filter_cat" value="keyword">
     <div class="title">$_('Keyword')</div>
     <input type="text" name="filter_value" id="filter_value"
     $if get('filter_cat') == "keyword":