diff --git a/RiotSwiftUI/Modules/Spaces/SpaceSelectorBottomSheet/SpaceSelector/View/SpaceSelectorListRow.swift b/RiotSwiftUI/Modules/Spaces/SpaceSelectorBottomSheet/SpaceSelector/View/SpaceSelectorListRow.swift
index d9e67c9b9..03b86ab45 100644
--- a/RiotSwiftUI/Modules/Spaces/SpaceSelectorBottomSheet/SpaceSelector/View/SpaceSelectorListRow.swift
+++ b/RiotSwiftUI/Modules/Spaces/SpaceSelectorBottomSheet/SpaceSelector/View/SpaceSelectorListRow.swift
@@ -57,6 +57,7 @@ struct SpaceSelectorListRow: View {
                             .clipShape(RoundedRectangle(cornerRadius: 8))
                     }
                     Text(displayName ?? "")
+                        .lineLimit(1)
                         .foregroundColor(theme.colors.primaryContent)
                         .font(theme.fonts.bodySB)
                         .accessibility(identifier: "itemName")
diff --git a/changelog.d/6579.bugfix b/changelog.d/6579.bugfix
new file mode 100644
index 000000000..d1a3181c1
--- /dev/null
+++ b/changelog.d/6579.bugfix
@@ -0,0 +1 @@
+App Layout: wrap Space names to 1 line only in the bottom sheet
\ No newline at end of file