diff --git a/src/app/wizardview/components/NoUsernamePopup.qml b/src/app/wizardview/components/NoUsernamePopup.qml
index a225097cf2ddebc851f37b3a3cc15617787b3e6a..dd4d25bb57d5f29654225be6478bc27902941f9c 100644
--- a/src/app/wizardview/components/NoUsernamePopup.qml
+++ b/src/app/wizardview/components/NoUsernamePopup.qml
@@ -52,14 +52,12 @@ BaseModalDialog {
     button1.onClicked: root.close()
 
     popupContent: Text {
-                Layout.fillWidth: true
-                Layout.preferredWidth: 280
-                Layout.leftMargin: 20
-                Layout.rightMargin: 20
-                Layout.alignment: Qt.AlignLeft
+                width: root.width - 2 * root.popupMargins
                 font.pixelSize: JamiTheme.popuptextSize
+
                 lineHeight: JamiTheme.wizardViewTextLineHeight
                 wrapMode: Text.WordWrap
+
                 color: JamiTheme.textColor
                 text: JamiStrings.joinJamiNoPassword
         }