diff --git a/ui/imports/shared/popups/keycard/KeycardPopup.qml b/ui/imports/shared/popups/keycard/KeycardPopup.qml
index 8a202e23d8..1b8d406e10 100644
--- a/ui/imports/shared/popups/keycard/KeycardPopup.qml
+++ b/ui/imports/shared/popups/keycard/KeycardPopup.qml
@@ -64,9 +64,8 @@ StatusModal {
     StatusScrollView {
         id: scrollView
         anchors.fill: parent
-
-        implicitWidth: Constants.keycard.general.popupWidth
         contentWidth: availableWidth
+        horizontalPadding: 0
 
         KeycardPopupContent {
             id: content
diff --git a/ui/imports/shared/popups/keycard/states/EnterPassword.qml b/ui/imports/shared/popups/keycard/states/EnterPassword.qml
index bc16ba7d4c..94776f083d 100644
--- a/ui/imports/shared/popups/keycard/states/EnterPassword.qml
+++ b/ui/imports/shared/popups/keycard/states/EnterPassword.qml
@@ -67,12 +67,14 @@ Item {
         StatusBaseText {
             id: title
             Layout.alignment: Qt.AlignCenter
+            Layout.maximumWidth: parent.width
             font.weight: Font.Bold
         }
 
         StatusBaseText {
             id: message
             Layout.alignment: Qt.AlignCenter
+            Layout.maximumWidth: parent.width
             wrapMode: Text.WordWrap
             visible: text != ""
         }
@@ -81,6 +83,7 @@ Item {
             id: password
             objectName: "keycardPasswordInput"
             Layout.alignment: Qt.AlignHCenter
+            Layout.maximumWidth: parent.width
             signingPhrase: root.sharedKeycardModule.getSigningPhrase()
             placeholderText: qsTr("Password")
             selectByMouse: true
@@ -102,6 +105,7 @@ Item {
         StatusBaseText {
             id: info
             Layout.alignment: Qt.AlignCenter
+            Layout.maximumWidth: parent.width
             wrapMode: Text.WordWrap
         }