diff --git a/src/roster_window.py b/src/roster_window.py
index 9040955a9..d4ae03f24 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -4041,6 +4041,8 @@ class RosterWindow:
         When an iter is activated (double-click or single click if gnome is set
         this way)
         """
+        if self.rfilter_enabled:
+            self.disable_rfilter()
         model = self.modelfilter
         account = model[path][C_ACCOUNT].decode('utf-8')
         type_ = model[path][C_TYPE]
@@ -4107,8 +4109,6 @@ 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)