diff --git a/gajim/gtk/chat_list_stack.py b/gajim/gtk/chat_list_stack.py
index 159cac8f4c059be5bd51dee9d5383535463719ec..3eadac18fa8ed91630c57b29b4cd850698541e13 100644
--- a/gajim/gtk/chat_list_stack.py
+++ b/gajim/gtk/chat_list_stack.py
@@ -49,7 +49,7 @@ class ChatListStack(Gtk.Stack):
                          (str, str, str)),
     }
 
-    def __init__(self, main_window, search_entry):
+    def __init__(self, search_entry):
         Gtk.Stack.__init__(self)
         self.set_hexpand(True)
         self.set_vexpand(True)
@@ -63,7 +63,7 @@ def __init__(self, main_window, search_entry):
 
         self.connect('notify::visible-child-name', self._on_visible_child_name)
         search_entry.connect('search-changed', self._on_search_changed)
-        main_window.connect('notify::is-active', self._on_window_active)
+        app.window.connect('notify::is-active', self._on_window_active)
 
         self._add_actions()
         self.show_all()
diff --git a/gajim/gtk/chat_page.py b/gajim/gtk/chat_page.py
index 70c4f53034bafd4a08f1bacbf3c1addc961be276..d753da81f901d90663e77313191d1fcb61ab5b73 100644
--- a/gajim/gtk/chat_page.py
+++ b/gajim/gtk/chat_page.py
@@ -59,7 +59,7 @@ def __init__(self):
         self._search_revealer.add(self._search_view)
         self._ui.right_grid_overlay.add_overlay(self._search_revealer)
 
-        self._chat_list_stack = ChatListStack(app.window, self._ui.search_entry)
+        self._chat_list_stack = ChatListStack(self._ui.search_entry)
         self._chat_list_stack.connect('chat-selected', self._on_chat_selected)
         self._chat_list_stack.connect('chat-unselected',
                                       self._on_chat_unselected)