diff --git a/Session/Closed Groups/NewClosedGroupVC.swift b/Session/Closed Groups/NewClosedGroupVC.swift
index d31f78331..44fe780c8 100644
--- a/Session/Closed Groups/NewClosedGroupVC.swift	
+++ b/Session/Closed Groups/NewClosedGroupVC.swift	
@@ -82,6 +82,10 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
         let customTitleFontSize = Values.largeFontSize
         setNavBarTitle("vc_create_closed_group_title".localized(), customFontSize: customTitleFontSize)
         
+        let closeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "X"), style: .plain, target: self, action: #selector(close))
+        closeButton.tintColor = Colors.text
+        navigationItem.rightBarButtonItem = closeButton
+        
         // Set up content
         setUpViewHierarchy()
     }
diff --git a/Session/Home/New Conversation/NewDMVC.swift b/Session/Home/New Conversation/NewDMVC.swift
index ab32a59f9..47fd20390 100644
--- a/Session/Home/New Conversation/NewDMVC.swift	
+++ b/Session/Home/New Conversation/NewDMVC.swift	
@@ -72,9 +72,11 @@ final class NewDMVC : BaseVC, UIPageViewControllerDataSource, UIPageViewControll
         setNavBarTitle(NSLocalizedString("vc_create_private_chat_title", comment: ""))
         let navigationBar = navigationController!.navigationBar
         // Set up navigation bar buttons
-        if !shouldShowBackButton {
-            let closeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "X"), style: .plain, target: self, action: #selector(close))
-            closeButton.tintColor = Colors.text
+        let closeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "X"), style: .plain, target: self, action: #selector(close))
+        closeButton.tintColor = Colors.text
+        if shouldShowBackButton {
+            navigationItem.rightBarButtonItem = closeButton
+        } else {
             navigationItem.leftBarButtonItem = closeButton
         }
         // Set up page VC
diff --git a/Session/Open Groups/JoinOpenGroupVC.swift b/Session/Open Groups/JoinOpenGroupVC.swift
index 382575c7e..1faad204f 100644
--- a/Session/Open Groups/JoinOpenGroupVC.swift	
+++ b/Session/Open Groups/JoinOpenGroupVC.swift	
@@ -59,6 +59,10 @@ final class JoinOpenGroupVC: BaseVC, UIPageViewControllerDataSource, UIPageViewC
         setUpNavBarStyle()
         setNavBarTitle("vc_join_public_chat_title".localized())
         
+        let closeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "X"), style: .plain, target: self, action: #selector(close))
+        closeButton.tintColor = Colors.text
+        navigationItem.rightBarButtonItem = closeButton
+        
         // Page VC
         let hasCameraAccess = (AVCaptureDevice.authorizationStatus(for: .video) == .authorized)
         pages = [ enterURLVC, (hasCameraAccess ? scanQRCodeWrapperVC : scanQRCodePlaceholderVC) ]