diff --git a/Classes/Base.lproj/ChatConversationView.xib b/Classes/Base.lproj/ChatConversationView.xib
index 581e265a8..aac56f489 100644
--- a/Classes/Base.lproj/ChatConversationView.xib
+++ b/Classes/Base.lproj/ChatConversationView.xib
@@ -112,6 +112,7 @@
                                     <state key="highlighted" backgroundImage="color_E.png"/>
                                     <connections>
                                         <action selector="onBackToCallClick:" destination="-2" eventType="touchUpInside" id="bOG-ra-UpM"/>
+                                        <outlet property="tableView" destination="8" id="w1i-Px-Wdf"/>
                                     </connections>
                                 </button>
                                 <button hidden="YES" opaque="NO" tag="8" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Wag-Nx-kd6" userLabel="deleteButton" customClass="UIIconButton">
diff --git a/Classes/Base.lproj/ChatsListView.xib b/Classes/Base.lproj/ChatsListView.xib
index 3762934c8..facfd51be 100644
--- a/Classes/Base.lproj/ChatsListView.xib
+++ b/Classes/Base.lproj/ChatsListView.xib
@@ -74,6 +74,7 @@
                                     <state key="highlighted" backgroundImage="color_E.png"/>
                                     <connections>
                                         <action selector="onBackToCallClick:" destination="-2" eventType="touchUpInside" id="eUD-Gk-qji"/>
+                                        <outlet property="tableView" destination="6" id="ePS-cV-S6m"/>
                                     </connections>
                                 </button>
                                 <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" reversesTitleShadowWhenHighlighted="YES" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="uqG-2T-VOa" userLabel="toggleSelectionButton" customClass="UIIconButton">
diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index 2b0f9f746..02da23aa1 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -169,7 +169,8 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 - (void)callUpdateEvent:(NSNotification *)notif {
-	_callButton.hidden = (linphone_core_get_current_call([LinphoneManager getLc]) != NULL);
+	_callButton.hidden =
+		(_tableController.isEditing || linphone_core_get_current_call([LinphoneManager getLc]) != NULL);
 }
 
 - (void)update {
@@ -499,7 +500,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (IBAction)onEditionChangeClick:(id)sender {
 	_backButton.hidden = _callButton.hidden = _tableController.isEditing;
-	_backToCallButton.hidden |= _tableController.isEditing;
+	[_backToCallButton update];
 }
 
 - (IBAction)onCallClick:(id)sender {
diff --git a/Classes/ChatsListView.m b/Classes/ChatsListView.m
index 4e5ce3404..09aa697e6 100644
--- a/Classes/ChatsListView.m
+++ b/Classes/ChatsListView.m
@@ -76,7 +76,8 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 - (IBAction)onEditionChangeClick:(id)sender {
-	_addButton.hidden = _backToCallButton.hidden = self.tableController.isEditing;
+	_addButton.hidden = self.tableController.isEditing;
+	[_backToCallButton update];
 }
 
 - (IBAction)onDeleteClick:(id)sender {
diff --git a/Classes/LinphoneUI/UIBackToCallButton.h b/Classes/LinphoneUI/UIBackToCallButton.h
index 0e9641f7c..31f3b6c5e 100644
--- a/Classes/LinphoneUI/UIBackToCallButton.h
+++ b/Classes/LinphoneUI/UIBackToCallButton.h
@@ -13,4 +13,5 @@
 - (IBAction)onBackToCallClick:(id)sender;
 - (void)update;
 
+@property(assign, nonatomic) IBOutlet UITableView *tableView;
 @end
diff --git a/Classes/LinphoneUI/UIBackToCallButton.m b/Classes/LinphoneUI/UIBackToCallButton.m
index 396ad3df3..377e1ea57 100644
--- a/Classes/LinphoneUI/UIBackToCallButton.m
+++ b/Classes/LinphoneUI/UIBackToCallButton.m
@@ -31,7 +31,7 @@
 }
 
 - (void)update {
-	self.hidden |= (linphone_core_get_current_call([LinphoneManager getLc]) == NULL);
+	self.hidden = (_tableView.isEditing || linphone_core_get_current_call([LinphoneManager getLc]) == NULL);
 }
 
 - (IBAction)onBackToCallClick:(id)sender {