diff --git a/src/advanced.py b/src/advanced.py
index 9bcc5890d..ea6a4d580 100644
--- a/src/advanced.py
+++ b/src/advanced.py
@@ -267,9 +267,19 @@ class AdvancedConfigurationWindow(object):
 				self.model.append(parent, [name, value, type_])
 
 	def visible_func(self, model, treeiter):
-		search_string  = self.entry.get_text()
-		return any(search_string in model[it][C_PREFNAME] for it in
-			tree_model_pre_order(model, treeiter) if model[it][C_TYPE] != '')
+		search_string  = self.entry.get_text().lower()
+		for it in tree_model_pre_order(model,treeiter): 
+			if model[it][C_TYPE] != '': 
+				opt_path = self.get_option_path(model, it) 
+				if len(opt_path) == 3: 
+					desc = gajim.config.get_desc_per(opt_path[2], opt_path[1], 
+						opt_path[0]) 
+				elif len(opt_path) == 1: 
+					desc = gajim.config.get_desc(opt_path[0]) 
+				if search_string in model[it][C_PREFNAME] or (desc and \
+				search_string in desc.lower()):
+					return True
+		return False
 
 	@rate_limit(3)
 	def on_advanced_entry_changed(self, widget):