diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
index e8cac0383..d5060c5f8 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
@@ -168,8 +168,6 @@ public Component getListCellRendererComponent(JList list, Object value,
                     buttonsPanelWidth, 16);
             this.nameLabel.setBounds(
                     0, 0, list.getWidth() - 2 - buttonsPanelWidth, 17);
-            
-            this.add(buttonsPanel, BorderLayout.EAST);
 
             this.isLeaf = true;
         } else if (value instanceof MetaContactGroup) {
@@ -194,9 +192,9 @@ public Component getListCellRendererComponent(JList list, Object value,
 
             //this.remove(buttonsPanel);
             this.buttonsPanel.removeAll();
-            
+
             JLabel groupContentIndicator = new JLabel();
-            
+
             if(((ContactListModel)list.getModel()).isGroupClosed(groupItem))
                 groupContentIndicator.setIcon(new ImageIcon(ImageLoader
                     .getImage(ImageLoader.CLOSED_GROUP)));
@@ -218,6 +216,8 @@ public Component getListCellRendererComponent(JList list, Object value,
             this.isLeaf = false;
         }
 
+        this.add(buttonsPanel, BorderLayout.EAST);
+
         toolTipText += "</html>";
         this.setToolTipText(toolTipText);