diff --git a/ElementX/Sources/Other/SwiftUI/Views/EditRoomAddressListRow.swift b/ElementX/Sources/Other/SwiftUI/Views/EditRoomAddressListRow.swift
index 6d14c4ec5..ba611c50c 100644
--- a/ElementX/Sources/Other/SwiftUI/Views/EditRoomAddressListRow.swift
+++ b/ElementX/Sources/Other/SwiftUI/Views/EditRoomAddressListRow.swift
@@ -13,12 +13,17 @@ struct EditRoomAddressListRow: View {
     var serverName: String
     var shouldDisplayError: Bool
     
+    private var fullAddress: String {
+        "#\(aliasLocalPart):\(serverName)"
+    }
+    
     var body: some View {
         ListRow(kind: .custom {
             HStack(spacing: 0) {
                 Text("#")
                     .font(.compound.bodyLG)
                     .foregroundStyle(.compound.textSecondary)
+                    .accessibilityHidden(true)
                 TextField("", text: $aliasLocalPart)
                     .textInputAutocapitalization(.never)
                     .autocorrectionDisabled()
@@ -27,9 +32,11 @@ struct EditRoomAddressListRow: View {
                     .font(.compound.bodyLG)
                     .foregroundStyle(.compound.textPrimary)
                     .padding(.horizontal, 8)
+                    .accessibilityHint(L10n.a11yEditRoomAddressHint(fullAddress))
                 Text(":\(serverName)")
                     .font(.compound.bodyLG)
                     .foregroundStyle(.compound.textSecondary)
+                    .accessibilityHidden(true)
             }
             .padding(ListRowPadding.textFieldInsets)
             .environment(\.layoutDirection, .leftToRight)
diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenContent.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenContent.swift
index 3f7fa98ba..edff821ce 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenContent.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenContent.swift
@@ -33,6 +33,9 @@ struct HomeScreenContent: View {
                         }
                     }
                     .disabled(true)
+                    .accessibilityRepresentation {
+                        Text(L10n.commonLoading)
+                    }
                 case .empty:
                     HomeScreenEmptyStateLayout(minHeight: geometry.size.height) {
                         topSection