--- a/mcabber/src/screen.c	Thu Apr 28 20:34:40 2005 +0000
+++ b/mcabber/src/screen.c	Fri Apr 29 05:53:24 2005 +0000
@@ -300,6 +300,8 @@
     top_panel(chatPanel);
     currentWindow = win_entry;  // == NULL  (current window empty)
   }
+
+  top_panel(inputPanel);
 }
 
 void scr_ShowBuddyWindow(void)
@@ -318,7 +320,6 @@
   }
 
   scr_ShowWindow(jid);
-  top_panel(inputPanel);
 }
 
 
@@ -370,6 +371,7 @@
     // Show and refresh the window
     top_panel(win_entry->panel);
     scr_UpdateWindow(win_entry);
+    top_panel(inputPanel);
     update_panels();
     doupdate();
   } else {
@@ -438,8 +440,6 @@
   inputPanel = new_panel(inputWnd);
 
   scr_DrawRoster();
-  update_panels();
-  doupdate();
   return;
 }
 
@@ -537,6 +537,7 @@
     i++;
   }
 
+  top_panel(inputPanel);
   update_panels();
   doupdate();
 }
@@ -550,7 +551,6 @@
 {
   // FIXME expand tabs / filter out special chars...
   scr_WriteMessage(jidfrom, text, "<== ");
-  top_panel(inputPanel);
   update_panels();
   doupdate();
 }
@@ -559,7 +559,6 @@
 {
   scr_WriteMessage(jidto, text, "--> ");
   scr_ShowWindow(jidto);
-  top_panel(inputPanel);
 }
 
 int scr_Getch(void)