diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomList.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomList.swift
index 8660382c3..0a234fd3f 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomList.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomList.swift
@@ -40,14 +40,6 @@ struct HomeScreenRoomList: View {
                         context.send(viewAction: .detachRoom(roomIdentifier: room.id))
                     })
                     .contextMenu {
-                        if supportsMultipleWindows {
-                            Button {
-                                context.send(viewAction: .detachRoom(roomIdentifier: room.id))
-                            } label: {
-                                Label("Open in new window", icon: \.popOut)
-                            }
-                        }
-                        
                         if room.badges.isDotShown {
                             Button {
                                 context.send(viewAction: .markRoomAsRead(roomIdentifier: room.id))
@@ -62,6 +54,14 @@ struct HomeScreenRoomList: View {
                             }
                         }
                         
+                        if supportsMultipleWindows {
+                            Button {
+                                context.send(viewAction: .detachRoom(roomIdentifier: room.id))
+                            } label: {
+                                Label("Open in new window", icon: \.spotlight)
+                            }
+                        }
+                        
                         if room.isFavourite {
                             Button {
                                 context.send(viewAction: .markRoomAsFavourite(roomIdentifier: room.id, isFavourite: false))