diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
index 3ca41e55d..17e7f4906 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
@@ -1207,9 +1207,6 @@ protected void sendInstantMessage()
         }
 
         this.refreshWriteArea();
-
-        //make sure the focus goes back to the write area
-        this.requestFocusInWriteArea();
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java
index 42d4687bc..c87279131 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java
@@ -66,7 +66,7 @@ public ChatSendPanel(ChatPanel chatPanel)
      * @param evt The <tt>ActionEvent</tt> object.
      */
     public void actionPerformed(ActionEvent evt)
-    {   
+    {
         if (!chatPanel.isWriteAreaEmpty())
         {
             new Thread()
@@ -77,6 +77,9 @@ public void run()
                 }
             }.start();
         }
+
+        //make sure the focus goes back to the write area
+        chatPanel.requestFocusInWriteArea();
     }
 
     /**