diff --git a/lib/pages/stream.dart b/lib/pages/stream.dart
index b59e30f..7f2823d 100644
--- a/lib/pages/stream.dart
+++ b/lib/pages/stream.dart
@@ -159,7 +159,6 @@ class _StreamPage extends State<StreamPage> with RouteAware {
           stream.info.host,
           children: [
             NotificationsButtonWidget(stream: widget.stream),
-            Spacer(),
             BasicButton(
               Row(
                 children: [Icon(Icons.bolt, size: 14), Text(t.zap.button_zap)],
diff --git a/lib/widgets/profile.dart b/lib/widgets/profile.dart
index 7c3c4af..0eeed71 100644
--- a/lib/widgets/profile.dart
+++ b/lib/widgets/profile.dart
@@ -65,6 +65,7 @@ class ProfileNameWidget extends StatelessWidget {
     final inner = Text(
       ProfileNameWidget.nameFromProfile(profile),
       style: style,
+      overflow: TextOverflow.ellipsis,
     );
     if (linkToProfile ?? true) {
       return GestureDetector(
@@ -130,10 +131,12 @@ class ProfileWidget extends StatelessWidget {
       children: [
         AvatarWidget(profile: profile, size: size),
         if (showName ?? true)
-          ProfileNameWidget(
-            profile: profile,
-            key: key,
-            linkToProfile: linkToProfile,
+          Expanded(
+            child: ProfileNameWidget(
+              profile: profile,
+              key: key,
+              linkToProfile: linkToProfile,
+            ),
           ),
         ...(children ?? []),
       ],