diff --git a/packages/SystemUI/res/layout/bubble_flyout.xml b/packages/SystemUI/res/layout/bubble_flyout.xml
index 7ab0a0c09f9b0..22a81357ee15c 100644
--- a/packages/SystemUI/res/layout/bubble_flyout.xml
+++ b/packages/SystemUI/res/layout/bubble_flyout.xml
@@ -47,6 +47,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@*android:string/config_bodyFontFamilyMedium"
                 android:maxLines="1"
+                android:ellipsize="end"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/>
 
             <TextView
@@ -55,6 +56,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@*android:string/config_bodyFontFamily"
                 android:maxLines="2"
+                android:ellipsize="end"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/>
 
         </LinearLayout>
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleFlyoutView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleFlyoutView.java
index ca53fa7e68116..e12b325f5d052 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleFlyoutView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleFlyoutView.java
@@ -230,8 +230,12 @@ public class BubbleFlyoutView extends FrameLayout {
             mSenderText.setTranslationX(0);
         }
 
+        final int maxTextViewWidth =
+                (int) (parentWidth * FLYOUT_MAX_WIDTH_PERCENT) - mFlyoutPadding * 2;
+
         // Name visibility
         if (!TextUtils.isEmpty(flyoutMessage.senderName)) {
+            mSenderText.setMaxWidth(maxTextViewWidth);
             mSenderText.setText(flyoutMessage.senderName);
             mSenderText.setVisibility(VISIBLE);
         } else {
@@ -248,8 +252,7 @@ public class BubbleFlyoutView extends FrameLayout {
         // Set the flyout TextView's max width in terms of percent, and then subtract out the
         // padding so that the entire flyout view will be the desired width (rather than the
         // TextView being the desired width + extra padding).
-        mMessageText.setMaxWidth(
-                (int) (parentWidth * FLYOUT_MAX_WIDTH_PERCENT) - mFlyoutPadding * 2);
+        mMessageText.setMaxWidth(maxTextViewWidth);
         mMessageText.setText(flyoutMessage.message);
 
         // Wait for the TextView to lay out so we know its line count.