diff --git a/qml/components/PhotoTextsListItem.qml b/qml/components/PhotoTextsListItem.qml
index 62f431a..f062420 100644
--- a/qml/components/PhotoTextsListItem.qml
+++ b/qml/components/PhotoTextsListItem.qml
@@ -87,7 +87,7 @@ ListItem {
             Rectangle {
                 id: chatUnreadMessagesCountBackground
                 color: isMuted ? ((Theme.colorScheme === Theme.DarkOnLight) ? "lightgray" : "dimgray") : Theme.highlightBackgroundColor
-                width: Theme.fontSizeLarge
+                width: chatUnreadMessagesCount.width + Theme.fontSizeLarge / 2
                 height: Theme.fontSizeLarge
                 anchors.right: parent.right
                 anchors.bottom: parent.bottom
diff --git a/qml/pages/ChatPage.qml b/qml/pages/ChatPage.qml
index b8310b3..55b4c40 100644
--- a/qml/pages/ChatPage.qml
+++ b/qml/pages/ChatPage.qml
@@ -1405,7 +1405,7 @@ Page {
 
                     Item {
                         id: chatUnreadMessagesItem
-                        width: Theme.fontSizeHuge
+                        width: chatUnreadMessagesCount.width + Theme.fontSizeLarge / 2
                         height: Theme.fontSizeHuge
                         anchors.right: parent.right
                         anchors.rightMargin: Theme.paddingMedium