diff --git a/lib/pangea/course_chats/activity_template_chat_list_item.dart b/lib/pangea/course_chats/activity_template_chat_list_item.dart
index dc4dc52e9..cd19b3c88 100644
--- a/lib/pangea/course_chats/activity_template_chat_list_item.dart
+++ b/lib/pangea/course_chats/activity_template_chat_list_item.dart
@@ -94,6 +94,7 @@ class ActivityTemplateChatListItem extends StatelessWidget {
                   left: 14.0,
                 ),
                 child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
                     Expanded(
                       child: OpenRolesIndicator(
@@ -102,16 +103,20 @@ class ActivityTemplateChatListItem extends StatelessWidget {
                         space: space,
                       ),
                     ),
-                    SizedBox(
-                      height: 24.0,
-                      width: 40.0,
+                    ConstrainedBox(
+                      constraints: const BoxConstraints(
+                        maxHeight: 24.0,
+                      ),
                       child: ElevatedButton(
                         onPressed: () => showFutureLoadingDialog(
                           context: context,
                           future: () => joinActivity(e),
                         ),
                         style: ElevatedButton.styleFrom(
-                          padding: const EdgeInsets.all(0),
+                          padding: const EdgeInsets.only(
+                            left: 8.0,
+                            right: 8.0,
+                          ),
                         ),
                         child: Text(
                           L10n.of(context).join,