diff --git a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/SIPCommTabbedPane.java b/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/SIPCommTabbedPane.java
index 2cefb76d1..f159aabe2 100644
--- a/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/SIPCommTabbedPane.java
+++ b/src/net/java/sip/communicator/impl/gui/main/customcontrols/tabbedPane/SIPCommTabbedPane.java
@@ -402,7 +402,7 @@ public void firePopupOutsideTabEvent(MouseEvent e) {
     
     /**
      * Overrides setSelectedIndex in JTabbedPane in order to remove the 
-     * hightlight if the tab which is selected is highlighted.
+     * hightlight if the tab which is selected.
      */
     public void setSelectedIndex(int tabIndex){
         if(paneUI.isTabHighlighted(tabIndex)){            
@@ -417,7 +417,8 @@ public void setSelectedIndex(int tabIndex){
      * @param tabIndex The tab index.
      */
     public void highlightTab(int tabIndex){
-        if(!paneUI.isTabHighlighted(tabIndex))
+        if(!paneUI.isTabHighlighted(tabIndex)
+        		&& this.getSelectedIndex() != tabIndex)
             this.paneUI.tabAddHightlight(tabIndex);
         
         this.repaint();