diff --git a/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m b/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
index f4ec6931e..689678250 100644
--- a/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
+++ b/Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
@@ -82,10 +82,20 @@
     [self.leftButton.layer setCornerRadius:5];
     self.leftButton.clipsToBounds = YES;
     self.leftButton.backgroundColor = ThemeService.shared.theme.tintColor;
+    // BWI: #5999 fix text color for button in dark mode
+    if (!BWIBuildSettings.shared.bumLoginFlowLayout)
+    {
+        [self.leftButton setTitleColor: ThemeService.shared.theme.backgroundColor forState:UIControlStateNormal];
+    }
     
     [self.rightButton.layer setCornerRadius:5];
     self.rightButton.clipsToBounds = YES;
     self.rightButton.backgroundColor = ThemeService.shared.theme.tintColor;
+    // BWI: #5999 fix text color for button in dark mode
+    if (!BWIBuildSettings.shared.bumLoginFlowLayout)
+    {
+        [self.rightButton setTitleColor: ThemeService.shared.theme.backgroundColor forState:UIControlStateNormal];
+    }
 }
 
 - (void)refreshDisplay