diff --git a/osu.Game/Online/Rooms/JoinRoomRequest.cs b/osu.Game/Online/Rooms/JoinRoomRequest.cs
index 2ceb37fc01..dfc7a53fb2 100644
--- a/osu.Game/Online/Rooms/JoinRoomRequest.cs
+++ b/osu.Game/Online/Rooms/JoinRoomRequest.cs
@@ -7,7 +7,7 @@ using osu.Game.Online.API;
 
 namespace osu.Game.Online.Rooms
 {
-    public class JoinRoomRequest : APIRequest
+    public class JoinRoomRequest : APIRequest<Room>
     {
         public readonly Room Room;
         public readonly string? Password;
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index ce087f1807..f40a4c941f 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -268,7 +268,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
 
         private void updateScreenModeWarning()
         {
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.macOS)
+            // Can be removed once we stop supporting SDL2.
+            if (RuntimeInfo.OS == RuntimeInfo.Platform.macOS && !FrameworkEnvironment.UseSDL3)
             {
                 if (windowModeDropdown.Current.Value == WindowMode.Fullscreen)
                     windowModeDropdown.SetNoticeText(LayoutSettingsStrings.FullscreenMacOSNote, true);
diff --git a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
index ca42e98e3c..73f980f0a3 100644
--- a/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
@@ -72,9 +72,13 @@ namespace osu.Game.Screens.OnlinePlay.Components
             currentJoinRoomRequest?.Cancel();
             currentJoinRoomRequest = new JoinRoomRequest(room, password);
 
-            currentJoinRoomRequest.Success += () =>
+            currentJoinRoomRequest.Success += result =>
             {
                 joinedRoom.Value = room;
+
+                AddOrUpdateRoom(result);
+                room.CopyFrom(result); // Also copy back to the source model, since this is likely to have been stored elsewhere.
+
                 onSuccess?.Invoke(room);
             };
 
diff --git a/osu.Game/Tests/Visual/OnlinePlay/TestRoomRequestsHandler.cs b/osu.Game/Tests/Visual/OnlinePlay/TestRoomRequestsHandler.cs
index 224bb90c8c..c9149bda22 100644
--- a/osu.Game/Tests/Visual/OnlinePlay/TestRoomRequestsHandler.cs
+++ b/osu.Game/Tests/Visual/OnlinePlay/TestRoomRequestsHandler.cs
@@ -71,7 +71,7 @@ namespace osu.Game.Tests.Visual.OnlinePlay
                         return true;
                     }
 
-                    joinRoomRequest.TriggerSuccess();
+                    joinRoomRequest.TriggerSuccess(createResponseRoom(room, true));
                     return true;
                 }