diff --git a/src/roster_window.py b/src/roster_window.py
index 8c196180c..3fbdf3bd0 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -3278,7 +3278,8 @@ class RosterWindow:
 		'''
 		self.close_all_from_dict(gajim.interface.instances[account])
 		for ctrl in gajim.interface.msg_win_mgr.get_controls(acct = account):
-			ctrl.parent_win.remove_tab(ctrl, force = force)
+			ctrl.parent_win.remove_tab(ctrl, ctrl.parent_win.CLOSE_CLOSE_BUTTON,
+				force = force)
 
 	def on_roster_window_delete_event(self, widget, event):
 		'''When we want to close the window'''