diff --git a/ui/StatusQ/src/StatusQ/Controls/StatusBaseButton.qml b/ui/StatusQ/src/StatusQ/Controls/StatusBaseButton.qml
index 08934ab650..6ab39fb1ac 100644
--- a/ui/StatusQ/src/StatusQ/Controls/StatusBaseButton.qml
+++ b/ui/StatusQ/src/StatusQ/Controls/StatusBaseButton.qml
@@ -34,6 +34,8 @@ Button {
     property color disabledTextColor
     property color borderColor: "transparent"
 
+    property int radius: size === StatusBaseButton.Size.Tiny ? 6 : 8
+
     property int size: StatusBaseButton.Size.Large
     property int type: StatusBaseButton.Type.Normal
 
@@ -70,7 +72,7 @@ Button {
     icon.width: 24
 
     background: Rectangle {
-        radius: root.size === StatusBaseButton.Size.Tiny ? 6 : 8
+        radius: root.radius
         border.color: root.borderColor
         color: {
             if (root.enabled)
diff --git a/ui/imports/shared/views/chat/InvitationBubbleView.qml b/ui/imports/shared/views/chat/InvitationBubbleView.qml
index cae871d18d..433e9c0c5c 100644
--- a/ui/imports/shared/views/chat/InvitationBubbleView.qml
+++ b/ui/imports/shared/views/chat/InvitationBubbleView.qml
@@ -27,6 +27,7 @@ Item {
         property var invitedCommunity
 
         readonly property int margin: 12
+        readonly property int radius: 16
 
         function getCommunity() {
             try {
@@ -81,16 +82,16 @@ Item {
             id: rectangleBubble
 
             width: 270
-            height: columnLayout.implicitHeight
-            radius: 16
+            height: columnLayout.implicitHeight + border.width * 2
+            radius: d.radius
             color: Style.current.background
             border.color: Style.current.border
             border.width: 1
 
             ColumnLayout {
                 id: columnLayout
-
-                width: parent.width
+                anchors.fill: parent
+                anchors.margins: 1
 
                 spacing: 0
 
@@ -217,6 +218,7 @@ Item {
                     Layout.preferredHeight: 44
 
                     text: qsTr("Go to Community")
+                    radius: d.radius - 1 // We do -1, otherwise there's a gap between border and button
 
                     onClicked: {
                         if (d.invitedCommunity.joined || d.invitedCommunity.spectated) {
@@ -225,11 +227,6 @@ Item {
                             root.store.spectateCommunity(communityId, userProfile.name)
                         }
                     }
-
-                    Component.onCompleted: {
-                        // FIXME: extract StatusButtonBackground or expose radius property in StatusBaseButton
-                        background.radius = 16
-                    }
                 }
             }
         }