diff --git a/ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift b/ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift
index a13d4db08..13b0337f3 100644
--- a/ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift
+++ b/ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift
@@ -37,6 +37,7 @@ struct AvatarHeaderView<Footer: View>: View {
                                     avatarSize: avatarSize,
                                     imageProvider: imageProvider)
             }
+            .buttonStyle(.borderless) // Add a button style to stop the whole row being tappable.
 
             Text(name ?? id)
                 .foregroundColor(.compound.textPrimary)
@@ -48,6 +49,7 @@ struct AvatarHeaderView<Footer: View>: View {
                     .foregroundColor(.compound.textSecondary)
                     .font(.compound.bodyLG)
                     .multilineTextAlignment(.center)
+                    .textSelection(.enabled)
             }
             
             footer()
diff --git a/changelog.d/1669.bugfix b/changelog.d/1669.bugfix
new file mode 100644
index 000000000..94615833a
--- /dev/null
+++ b/changelog.d/1669.bugfix
@@ -0,0 +1 @@
+Fix avatar button size and make mxid copyable in Room/Member details screens.
\ No newline at end of file