diff --git a/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift b/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift
index 23fb1df7d..0af4ad3d4 100644
--- a/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift
+++ b/Classes/Swift/Chat/Views/ChatConversationViewSwift.swift
@@ -173,6 +173,8 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
 		}
 		 */
 		
+		contentMessageView.floatingButton.addTarget(self, action: #selector(self.alertActionGoToDevicesList), for: .touchUpInside)
+		
 		ChatConversationViewModel.sharedModel.isComposing.observe { compose in
 			if((compose! && self.contentMessageView.isComposingView.isHidden)||(!compose! && !self.contentMessageView.isComposingView.isHidden)){
 				self.setComposingVisible(compose!, withDelay: 0.3)
@@ -709,7 +711,7 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
 		
 	}
 	
-	func alertActionGoToDevicesList() {
+	@objc func alertActionGoToDevicesList() {
 		
 		let notAskAgain = ConfigManager.instance().lpConfigBoolForKey(key: "confirmation_dialog_before_sas_call_not_ask_again");
 		if(!notAskAgain){
diff --git a/Classes/Swift/Util/ContentMessageView.swift b/Classes/Swift/Util/ContentMessageView.swift
index 34c63c7d6..ea55cd44d 100644
--- a/Classes/Swift/Util/ContentMessageView.swift
+++ b/Classes/Swift/Util/ContentMessageView.swift
@@ -163,7 +163,7 @@ class ContentMessageView:  UIViewController {
 		constraintLandscapeFloatingButton = floatingButton.rightAnchor.constraint(equalTo: self.view.rightAnchor, constant: -56)
 		if UIDevice.current.orientation.isLandscape {
 			constraintLandscapeFloatingButton!.isActive = true
-		} else if UIDevice.current.orientation.isPortrait {
+		} else {
 			constraintFloatingButton!.isActive = true
 		}
 		floatingButton.topAnchor.constraint(equalTo: self.view.layoutMarginsGuide.topAnchor, constant: top_bar_height).isActive = true