diff --git a/src/config.py b/src/config.py
index 3bcd50327..13b796489 100644
--- a/src/config.py
+++ b/src/config.py
@@ -2166,6 +2166,8 @@ class RemoveAccountWindow:
 		
 		if self.remove_and_unregister_radiobutton.get_active():  
 			gajim.connections[self.account].unregister_account()
+		# Close all opened windows
+		gajim.interface.rostrer.close_all(gajim.interface.instances[self.account])
 		del gajim.connections[self.account]
 		gajim.config.del_per('accounts', self.account)
 		gajim.interface.save_config()