diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java
index 4d1cf652b..63e6b47fa 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommDialog.java
@@ -184,6 +184,11 @@ public void setVisible(boolean isVisible)
             this.setSizeAndLocation();
         }
         
+        JButton button = this.getRootPane().getDefaultButton();
+        
+        if(button != null)
+            button.requestFocus();
+        
         super.setVisible(isVisible);
     }