diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index a5ab0d16e..c94d46dcf 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -29,7 +29,6 @@ import 'package:fluffychat/pages/chat/recording_dialog.dart';
 import 'package:fluffychat/pages/chat_details/chat_details.dart';
 import 'package:fluffychat/pangea/activity_sessions/activity_role_model.dart';
 import 'package:fluffychat/pangea/activity_sessions/activity_room_extension.dart';
-import 'package:fluffychat/pangea/activity_sessions/activity_session_start/activity_session_start_page.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
 import 'package:fluffychat/pangea/analytics_misc/constructs_model.dart';
 import 'package:fluffychat/pangea/analytics_misc/gain_points_animation.dart';
@@ -2368,14 +2367,6 @@ class ChatController extends State<ChatPageWithRoom>
             child: CircularProgressIndicator.adaptive(),
           );
         }
-
-        if (room.isActivitySession && !room.isActivityStarted) {
-          return ActivitySessionStartPage(
-            activityId: room.activityId!,
-            roomId: room.id,
-            parentId: room.courseParent?.id,
-          );
-        }
         // Pangea#
         final theme = Theme.of(context);
         return Row(
diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index 28d6322c8..1cddbbe92 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -17,6 +17,7 @@ import 'package:fluffychat/pangea/activity_sessions/activity_room_extension.dart
 import 'package:fluffychat/pangea/activity_sessions/activity_session_chat/activity_menu_button.dart';
 import 'package:fluffychat/pangea/activity_sessions/activity_session_chat/activity_session_popup_menu.dart';
 import 'package:fluffychat/pangea/activity_sessions/activity_session_chat/activity_stats_menu.dart';
+import 'package:fluffychat/pangea/activity_sessions/activity_session_start/activity_session_start_page.dart';
 import 'package:fluffychat/pangea/analytics_misc/level_up/star_rain_widget.dart';
 import 'package:fluffychat/pangea/chat/widgets/chat_floating_action_button.dart';
 import 'package:fluffychat/pangea/chat/widgets/chat_input_bar.dart';
@@ -203,6 +204,16 @@ class ChatView extends StatelessWidget {
         builder: (context, snapshot) => FutureBuilder(
           future: controller.loadTimelineFuture,
           builder: (BuildContext context, snapshot) {
+            // #Pangea
+            if (controller.room.isActivitySession &&
+                !controller.room.isActivityStarted) {
+              return ActivitySessionStartPage(
+                activityId: controller.room.activityId!,
+                roomId: controller.roomId,
+                parentId: controller.room.courseParent?.id,
+              );
+            }
+            // Pangea#
             var appbarBottomHeight = 0.0;
             if (controller.room.pinnedEventIds.isNotEmpty) {
               appbarBottomHeight += ChatAppBarListTile.fixedHeight;
diff --git a/lib/pangea/activity_sessions/activity_session_chat/activity_role_tooltip.dart b/lib/pangea/activity_sessions/activity_session_chat/activity_role_tooltip.dart
index 210949f96..3b2459e41 100644
--- a/lib/pangea/activity_sessions/activity_session_chat/activity_role_tooltip.dart
+++ b/lib/pangea/activity_sessions/activity_session_chat/activity_role_tooltip.dart
@@ -30,11 +30,7 @@ class ActivityRoleTooltip extends StatelessWidget {
           onClose: () async {
             await room.dismissGoalTooltip();
           },
-          padding: const EdgeInsets.only(
-            left: 16.0,
-            top: 16.0,
-            right: 16.0,
-          ),
+          padding: const EdgeInsets.all(16.0),
         );
       },
     );