diff --git a/src/net/java/sip/communicator/impl/gui/main/message/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/message/ChatWindow.java
index eea8ee4f5..4cd3deaf7 100755
--- a/src/net/java/sip/communicator/impl/gui/main/message/ChatWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/message/ChatWindow.java
@@ -233,7 +233,11 @@ private void addChatTab(ChatPanel chatPanel)
 
                 chatTabbedPane.addTab(contactName, new ImageIcon(Constants
                     .getStatusIcon(status)), chatPanel);
-
+				
+				//when added to the tabbed pane, the first chat panel should rest
+				//the selected component
+                chatTabbedPane.setSelectedComponent(firstChatPanel);
+                
                 // Workaround for the following problem:
                 // The scrollbar in the conversation area moves up when the
                 // scrollpane is resized. This happens when ChatWindow is in