diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index 72528de11..b7b9d2aac 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -118,6 +118,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 											 object:nil];
 
 	[_backToCallButton update];
+	_callButton.hidden = !_backToCallButton.hidden;
 
 	if (_tableController.isEditing) {
 		[_tableController setEditing:NO];
@@ -149,6 +150,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	composingVisible = !composingVisible;
 	[self setComposingVisible:!composingVisible withDelay:0];
 	[_backToCallButton update];
+	self.callButton.hidden = !self.backToCallButton.hidden;
 	[_tableController scrollToBottom:true];
 }
 
@@ -185,6 +187,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (void)callUpdateEvent:(NSNotification *)notif {
 	_callButton.hidden = (_tableController.isEditing || linphone_core_get_current_call(LC) != NULL);
+	_backToCallButton.hidden = !_callButton.hidden;
 }
 
 - (void)update {
@@ -525,6 +528,9 @@ static UICompositeViewDescription *compositeDescription = nil;
 - (IBAction)onEditionChangeClick:(id)sender {
 	_backButton.hidden = _callButton.hidden = _tableController.isEditing;
 	[_backToCallButton update];
+	if (!_backToCallButton.hidden) {
+		_callButton.hidden = TRUE;
+	}
 }
 
 - (IBAction)onCallClick:(id)sender {
diff --git a/Classes/ChatsListView.m b/Classes/ChatsListView.m
index c78ad994b..dd12891d7 100644
--- a/Classes/ChatsListView.m
+++ b/Classes/ChatsListView.m
@@ -31,6 +31,10 @@
 										   selector:@selector(textReceivedEvent:)
 											   name:kLinphoneMessageReceived
 											 object:nil];
+	[NSNotificationCenter.defaultCenter addObserver:self
+										   selector:@selector(callUpdateEvent:)
+											   name:kLinphoneCallUpdate
+											 object:nil];
 	[_backToCallButton update];
 	[self setEditing:NO];
 }
@@ -47,6 +51,10 @@
 	[_tableController loadData];
 }
 
+- (void)callUpdateEvent:(NSNotification *)notif {
+	[_backToCallButton update];
+}
+
 #pragma mark - UICompositeViewDelegate Functions
 
 static UICompositeViewDescription *compositeDescription = nil;