diff --git a/lib/widgets/member_list.dart b/lib/widgets/member_list.dart
index 7bce48d..3d7ecec 100644
--- a/lib/widgets/member_list.dart
+++ b/lib/widgets/member_list.dart
@@ -28,7 +28,6 @@ class MemberList extends HookConsumerWidget {
     return Drawer(
       shape: Border(),
       child: Column(
-        spacing: 8,
         children: [
           AppBar(
             scrolledUnderElevation: 0,
@@ -44,9 +43,10 @@ class MemberList extends HookConsumerWidget {
                 ),
             ],
           ),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.center,
+          Wrap(
+            alignment: WrapAlignment.center,
             spacing: 8,
+            runSpacing: 8,
             children: [
               FilterChip(
                 label: Text("Joined"),
diff --git a/lib/widgets/user_popover.dart b/lib/widgets/user_popover.dart
index 5da1368..165852e 100644
--- a/lib/widgets/user_popover.dart
+++ b/lib/widgets/user_popover.dart
@@ -114,7 +114,6 @@ class UserPopover extends ConsumerWidget {
               ),
             ),
             Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 SelectableText(
                   member.displayName ?? userId.localpart,
@@ -127,7 +126,9 @@ class UserPopover extends ConsumerWidget {
                     .betterWhen(
                       loading: SizedBox.shrink,
                       data: (profile) => Wrap(
+                        alignment: WrapAlignment.center,
                         spacing: 4,
+                        runSpacing: 4,
                         children: [
                           for (final pronoun in profile.pronouns.where(
                             (pronoun) => pronoun.language == "en",