diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java
index 6adb739d5..7395f30bd 100755
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java
@@ -480,13 +480,17 @@ public void windowClosing(WindowEvent e) {
                 chatPanel 
                     = tabbedChatWindow.addChatTab(metaContact, contactStatus,
                             protocolContact);
+
+                tabbedChatWindow.setCurrentChatPanel(chatPanel);
                 
                 chatPanel.getConversationPanel()
                     .processMessage(evt.getSourceContact().getDisplayName(), 
                             evt.getTimestamp(), ChatMessage.INCOMING_MESSAGE, 
                             evt.getSourceMessage().getContent());
                 
-                tabbedChatWindow.setVisible(true);                
+                tabbedChatWindow.setVisible(true);
+
+				tabbedChatWindow.requestFocusInCurrentChat();
             }
             else{
                 chatPanel = tabbedChatWindow.getChatPanel(metaContact); 
@@ -703,4 +707,4 @@ private void setMetaContact(MetaContact metaContact){
             this.metaContact = metaContact;
         }
     }    
-}
\ No newline at end of file
+}