diff --git a/src/message_window.py b/src/message_window.py
index 26b05e47f6e5fc3ca2669ad4ad3ad925008c34bc..4dff5394c59cbdbacd9a76e158bc7a4ed1918b4d 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -687,6 +687,10 @@ _('Do you really want to close them all?'),
         except KeyError:
             return
 
+        if new_jid in self._controls[acct]:
+            self.remove_tab(self._controls[acct][new_jid],
+                self.CLOSE_CLOSE_BUTTON, force=True)
+
         self._controls[acct][new_jid] = ctrl
         del self._controls[acct][old_jid]