diff --git a/ui/StatusQ/src/StatusQ/Components/StatusListItem.qml b/ui/StatusQ/src/StatusQ/Components/StatusListItem.qml
index 8b94cb6142..5f5d90453e 100644
--- a/ui/StatusQ/src/StatusQ/Components/StatusListItem.qml
+++ b/ui/StatusQ/src/StatusQ/Components/StatusListItem.qml
@@ -271,6 +271,8 @@ Rectangle {
                     visible: !!root.subTitle
                     wrapMode: Text.WrapAtWordBoundaryOrAnywhere
                     loading: root.loading
+                    maximumLineCount: 3
+                    elide: Text.ElideRight
                 }
 
                 StatusTextWithLoadingState {
diff --git a/ui/StatusQ/src/StatusQ/Controls/StatusBaseButton.qml b/ui/StatusQ/src/StatusQ/Controls/StatusBaseButton.qml
index 2bbe6ef72e..3a586d9c2c 100644
--- a/ui/StatusQ/src/StatusQ/Controls/StatusBaseButton.qml
+++ b/ui/StatusQ/src/StatusQ/Controls/StatusBaseButton.qml
@@ -127,10 +127,11 @@ Button {
         StatusBaseText {
             Layout.alignment: root.textAlignment
             Layout.fillWidth: root.textFillWidth
-            opacity: !loading
+            opacity: !root.loading
             font: root.font
             text: root.text
             color: d.textColor
+            visible: text
             verticalAlignment: Text.AlignVCenter
             elide: Text.ElideRight
         }