diff --git a/sflphone-client-gnome/src/contacts/calltree.c b/sflphone-client-gnome/src/contacts/calltree.c
index e1428fa1c531ab7436f346f243b418d3e051a4a7..3df57242285774da62125580ab4ec2eb32318c05 100644
--- a/sflphone-client-gnome/src/contacts/calltree.c
+++ b/sflphone-client-gnome/src/contacts/calltree.c
@@ -1158,13 +1158,14 @@ void calltree_display (calltab_t *tab) {
 
         DEBUG ("display main tab");
 
-	/*
+	
         if (active_calltree==contacts) {
             gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)contactButton, FALSE);
         } else {
             gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)historyButton, FALSE);
         }
-	*/
+		gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)currentCallsButton, TRUE);
+	
     }
 
     /* case 2: we want to display the history */
@@ -1173,10 +1174,10 @@ void calltree_display (calltab_t *tab) {
         DEBUG ("display history tab");
 
         if (active_calltree==contacts) {
-            //gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)contactButton, FALSE);
+            gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)contactButton, FALSE);
         }
 
-        //gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)historyButton, TRUE);
+        gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)historyButton, TRUE);
     }
 
     else if (tab==contacts) {
@@ -1184,10 +1185,10 @@ void calltree_display (calltab_t *tab) {
         DEBUG ("display contact tab");
 
         if (active_calltree==history) {
-            //gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)historyButton, FALSE);
+            gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)historyButton, FALSE);
         }
 
-        //gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)contactButton, TRUE);
+        gtk_toggle_tool_button_set_active ((GtkToggleToolButton*)contactButton, TRUE);
     }
 
     else
diff --git a/sflphone-client-gnome/src/ui.xml b/sflphone-client-gnome/src/ui.xml
index 6308142199411d52bb6382c3f1e5437842ad9e72..72b51160a1e691d1ac9a8da4772cd77c070aaa50 100644
--- a/sflphone-client-gnome/src/ui.xml
+++ b/sflphone-client-gnome/src/ui.xml
@@ -55,9 +55,9 @@
 	</toolbar>
 
 	<toolbar name="ToolbarWindows">
-		<toolitem action="CallWindow"/>
-		<toolitem action="History"/>
-		<toolitem action="Addressbook"/>
+		<toolitem name="CallWindowToolbar" action="CallWindow"/>
+		<toolitem name="HistoryToolbar" action="History"/>
+		<toolitem name="AddressbookToolbar" action="Addressbook"/>
 	</toolbar>
 
 </ui>
diff --git a/sflphone-client-gnome/src/uimanager.c b/sflphone-client-gnome/src/uimanager.c
index b1b2e8ef586a504e27a92bf800a286a763f545ae..a0a41c7912f1c330074711620373857b97c37bdb 100644
--- a/sflphone-client-gnome/src/uimanager.c
+++ b/sflphone-client-gnome/src/uimanager.c
@@ -1386,5 +1386,9 @@ GtkWidget* create_toolbar_windows (GtkUIManager *ui_manager)
 	toolbar = gtk_ui_manager_get_widget (ui_manager, "/ToolbarWindows");
 	active_calltree = current_calls;
 
+	historyButton = gtk_ui_manager_get_widget (ui_manager, "/ToolbarWindows/HistoryToolbar");
+	contactButton = gtk_ui_manager_get_widget (ui_manager, "/ToolbarWindows/AddressbookToolbar");
+	currentCallsButton = gtk_ui_manager_get_widget (ui_manager, "/ToolbarWindows/CallWindowToolbar");
+
 	return toolbar;
 }
diff --git a/sflphone-client-gnome/src/uimanager.h b/sflphone-client-gnome/src/uimanager.h
index cd8db9f1b7bc9b60e70007025412fa4340086383..09c8394b6690c740b4f6960b42d37a8ee5a0a841 100644
--- a/sflphone-client-gnome/src/uimanager.h
+++ b/sflphone-client-gnome/src/uimanager.h
@@ -27,6 +27,10 @@ G_BEGIN_DECLS
 guint transfertButtonConnId; //The button toggled signal connection ID
 guint holdConnId;     //The hold_menu signal connection ID
 
+GtkWidget *historyButton;
+GtkWidget *contactButton;
+GtkWidget *currentCallsButton;
+
 gboolean uimanager_new (GtkUIManager**);
 
 G_END_DECLS