diff --git a/src/dialogs.py b/src/dialogs.py
index a6c2d9ce5..7d5c8cdb0 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -2325,7 +2325,7 @@ class SubscriptionRequestWindow:
         menu = self.prepare_popup_menu()
         menu.show_all()
         gtkgui_helpers.popup_emoticons_under_button(menu, widget,
-            self.window.window)
+            self.window.get_window())
 
 
 class JoinGroupchatWindow:
diff --git a/src/disco.py b/src/disco.py
index 67b30d645..b366547c1 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -869,7 +869,7 @@ class AgentBrowser:
         """
         Set the initial window title based on agent address
         """
-        self.window.window.set_title(_('Browsing %(address)s using account '
+        self.window.get_window().set_title(_('Browsing %(address)s using account '
                 '%(account)s') % {'address': self._get_agent_address(),
                 'account': self.account})
         self.window._set_window_banner_text(self._get_agent_address())
diff --git a/src/message_window.py b/src/message_window.py
index 3a907972a..999509ed0 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -396,7 +396,7 @@ class MessageWindow(object):
                 # CTRL + PageUp | PageDown
                 # Create event and send it to notebook
                 event = Gdk.Event(Gdk.EventType.KEY_PRESS)
-                event.window = self.window.window
+                event.window = self.window.get_window()
                 event.time = int(time.time())
                 event.state = Gdk.ModifierType.CONTROL_MASK
                 event.keyval = int(keyval)
diff --git a/src/roster_window.py b/src/roster_window.py
index 27a1c76ff..e5ffea758 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -3420,7 +3420,7 @@ class RosterWindow:
             if gc_control:
                 mw = gajim.interface.msg_win_mgr.get_window(jid, account)
                 mw.set_active_tab(gc_control)
-                mw.window.window.focus(Gtk.get_current_event_time())
+                mw.window.get_window().focus(Gtk.get_current_event_time())
             return
         ctrl = gajim.interface.minimized_controls[account][jid]
         mw = gajim.interface.msg_win_mgr.get_window(jid, account)
@@ -3430,7 +3430,7 @@ class RosterWindow:
         ctrl.parent_win = mw
         mw.new_tab(ctrl)
         mw.set_active_tab(ctrl)
-        mw.window.window.focus(Gtk.get_current_event_time())
+        mw.window.get_window().focus(Gtk.get_current_event_time())
         self.remove_groupchat(jid, account)
 
     def on_edit_account(self, widget, account):