diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m
index ffa770fb2..2d8acb88d 100644
--- a/Classes/LinphoneAppDelegate.m
+++ b/Classes/LinphoneAppDelegate.m
@@ -676,10 +676,12 @@
 				LinphoneChatRoom *room = linphone_core_find_chat_room(LC, peer, local);
 				if (room) {
 					[PhoneMainView.instance resetBeforeGoToChatRoomSwift];
+					[PhoneMainView.instance changeCurrentView:ChatsListView.compositeViewDescription];
 					[PhoneMainView.instance goToChatRoomSwift:room];
 					return;
+				} else {
+					[PhoneMainView.instance changeCurrentView:ChatsListView.compositeViewDescription];
 				}
-				[PhoneMainView.instance changeCurrentView:ChatsListView.compositeViewDescription];
 			}
 		} else if ([response.notification.request.content.categoryIdentifier isEqual:@"video_request"]) {
 			if (!call) return;
diff --git a/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift b/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift
index 887225a8f..795ae38a3 100644
--- a/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift
+++ b/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift
@@ -304,6 +304,7 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
 		
 		field.isUserInteractionEnabled = false
 		
+		/*
 		let keyWindow = UIApplication.shared.windows.filter {$0.isKeyWindow}.first
 		if keyWindow != nil {
 			if ConfigManager.instance().lpConfigBoolForKey(key: "screenshot_preference") == false && floatingButton.isHidden == false {
@@ -312,6 +313,7 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
 				PhoneMainView.instance()!.mainViewController.view.changeSecure(field: field, isSecure: false)
 			}
 		}
+		 */
 	}
     
     override func viewWillDisappear(_ animated: Bool) {
@@ -320,10 +322,12 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
         }
         AvatarBridge.removeAllObserver()
 		
+		/*
 		let keyWindow = UIApplication.shared.windows.filter {$0.isKeyWindow}.first
 		if keyWindow != nil {
 			PhoneMainView.instance()!.mainViewController.view.changeSecure(field: field, isSecure: false)
 		}
+		 */
 		
 		field.isUserInteractionEnabled = true
     }