diff --git a/gtk/friendlist.c b/gtk/friendlist.c
index 3e65cf6b8..8a485ec36 100644
--- a/gtk/friendlist.c
+++ b/gtk/friendlist.c
@@ -361,8 +361,19 @@ void linphone_gtk_chat_selected(GtkWidget *item){
 
 void linphone_gtk_contact_clicked(GtkTreeSelection *selection){
 	GtkTreeView *friendlist = gtk_tree_selection_get_tree_view(selection);
+	GtkWidget *mw = linphone_gtk_get_main_window();
+	GtkWidget *edit_button = linphone_gtk_get_widget(mw, "edit_button");
+	GtkWidget *remove_button = linphone_gtk_get_widget(mw, "remove_button");
+	
 	linphone_gtk_set_selection_to_uri_bar(friendlist);
 	linphone_gtk_friend_list_update_button_display(friendlist);
+	if(gtk_tree_selection_get_selected(selection, NULL, NULL)) {
+		gtk_widget_set_sensitive(edit_button, TRUE);
+		gtk_widget_set_sensitive(remove_button, TRUE);
+	} else {
+		gtk_widget_set_sensitive(edit_button, FALSE);
+		gtk_widget_set_sensitive(remove_button, FALSE);
+	}
 }
 
 
diff --git a/gtk/main.ui b/gtk/main.ui
index 0f55ca070..ce560cd69 100644
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -566,6 +566,7 @@
                             <property name="width_request">32</property>
                             <property name="height_request">32</property>
                             <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="image">edit_image1</property>
@@ -582,6 +583,7 @@
                             <property name="width_request">32</property>
                             <property name="height_request">32</property>
                             <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="image">remove_image1</property>