diff --git a/src/command/commands.c b/src/command/commands.c
index 15b740e3..c58a1588 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -993,6 +993,7 @@ cmd_disconnect(ProfWin *window, const char *const command, gchar **args)
         chat_sessions_clear();
         tlscerts_clear_current();
         ui_disconnected();
+        ui_close_all_wins();
 #ifdef HAVE_LIBGPGME
         p_gpg_on_disconnect();
 #endif