--- a/mcabber/src/screen.c	Sat Feb 03 20:14:34 2007 +0100
+++ b/mcabber/src/screen.c	Sat Feb 03 20:45:37 2007 +0100
@@ -1780,6 +1780,7 @@
   if (closebuf && !isspe) {
     scr_set_chatmode(FALSE);
     g_hash_table_remove(winbufhash, CURRENT_JID);
+    currentWindow = NULL;
   }
 
   // Refresh the window