diff --git a/src/roster_window.py b/src/roster_window.py
index 41386e83f..d78843156 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -320,7 +320,7 @@ class RosterWindow:
         return iter_group
 
     def _add_entity(self, contact, account, groups=None,
-                    big_brother_contact=None, big_brother_account=None):
+    big_brother_contact=None, big_brother_account=None):
         """
         Add the given contact to roster data model
 
@@ -1140,7 +1140,8 @@ class RosterWindow:
         self.draw_contact(parent_jid, parent_account)
         return False
 
-    def draw_contact(self, jid, account, selected=False, focus=False, contact_instances=None, contact=None):
+    def draw_contact(self, jid, account, selected=False, focus=False,
+    contact_instances=None, contact=None):
         """
         Draw the correct state image, name BUT not avatar
         """
@@ -3439,7 +3440,8 @@ class RosterWindow:
             num = gtk.gdk.keyval_to_unicode(event.keyval)
             self.enable_rfilter(unichr(num))
 
-        elif event.state & gtk.gdk.CONTROL_MASK and event.state & gtk.gdk.SHIFT_MASK and event.keyval == gtk.keysyms.U:
+        elif event.state & gtk.gdk.CONTROL_MASK and \
+        event.state & gtk.gdk.SHIFT_MASK and event.keyval == gtk.keysyms.U:
             self.enable_rfilter('')
             self.rfilter_entry.emit('key_press_event', event)
 
@@ -4112,6 +4114,8 @@ class RosterWindow:
         """
         When an iter is double clicked: open the first event window
         """
+        if self.rfilter_enabled:
+            self.disable_rfilter()
         if not gajim.single_click:
             self.on_row_activated(widget, path)