diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart
index ad25a30..263e488 100644
--- a/lib/controllers/client_controller.dart
+++ b/lib/controllers/client_controller.dart
@@ -15,7 +15,9 @@ class ClientController extends AsyncNotifier<Client> {
   bool updateShouldNotify(
     AsyncValue<Client> previous,
     AsyncValue<Client> next,
-  ) => previous.hasValue != next.hasValue;
+  ) =>
+      previous.hasValue != next.hasValue ||
+      previous.value?.accessToken != next.value?.accessToken;
   static const sessionBackupKey = "sessionBackup";
 
   @override
diff --git a/lib/widgets/chat_page/mention_overlay.dart b/lib/widgets/chat_page/mention_overlay.dart
index 8477f22..af9e585 100644
--- a/lib/widgets/chat_page/mention_overlay.dart
+++ b/lib/widgets/chat_page/mention_overlay.dart
@@ -108,7 +108,7 @@ class MentionOverlay extends ConsumerWidget {
                                 title: Text(room.title),
                                 subtitle: room.roomData.topic.isEmpty
                                     ? null
-                                    : Text(room.roomData.topic),
+                                    : Text(room.roomData.topic, maxLines: 1),
                                 onTap: () => addTag(
                                   id: "[#${room.roomData.getLocalizedDisplayname()}](https://matrix.to/#/${room.roomData.id})",
                                   name:
diff --git a/lib/widgets/chat_page/room_appbar.dart b/lib/widgets/chat_page/room_appbar.dart
index 17696dd..b36a3ad 100644
--- a/lib/widgets/chat_page/room_appbar.dart
+++ b/lib/widgets/chat_page/room_appbar.dart
@@ -36,7 +36,7 @@ class RoomAppbar extends StatelessWidget implements PreferredSizeWidget {
     title: Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text(room.title, overflow: TextOverflow.ellipsis),
+        Text(room.title, overflow: TextOverflow.ellipsis, maxLines: 1),
         if (room.roomData.topic.isNotEmpty)
           Text(
             room.roomData.topic,