diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/PortSettings.qml b/internal/frontend/bridge-gui/bridge-gui/qml/PortSettings.qml
index 05a6632f..e421111b 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/PortSettings.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/PortSettings.qml
@@ -56,6 +56,7 @@ SettingsView {
             colorScheme: root.colorScheme
             label: qsTr("IMAP port")
             Layout.preferredWidth: 160
+            Layout.alignment: Qt.AlignTop | Qt.AlignLeft
             validator: root.validate
         }
         TextField {
@@ -63,6 +64,7 @@ SettingsView {
             colorScheme: root.colorScheme
             label: qsTr("SMTP port")
             Layout.preferredWidth: 160
+            Layout.alignment: Qt.AlignTop | Qt.AlignLeft
             validator: root.validate
         }
     }
@@ -86,7 +88,7 @@ SettingsView {
                 imapField.error = false
                 smtpField.error = false
 
-                // checking errors seperatly because we want to display "same port" error only once
+                // checking errors separately because we want to display "same port" error only once
                 imapField.validate()
                 if (imapField.error) {
                     return
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/TextField.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/TextField.qml
index 094e47d4..bd400eb4 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/TextField.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/TextField.qml
@@ -320,8 +320,8 @@ FocusScope {
                 visible: root.error && (assistiveText.text.length > 0)
                 source: "../icons/ic-exclamation-circle-filled.svg"
                 color: root.colorScheme.signal_danger
-                height: assistiveText.height
-                sourceSize.height: assistiveText.height
+                height: assistiveText.lineHeight
+                sourceSize.height: assistiveText.lineHeight
             }
 
             Proton.Label {
@@ -330,6 +330,7 @@ FocusScope {
 
                 Layout.fillHeight: true
                 Layout.fillWidth: true
+                wrapMode: Text.WordWrap
 
                 text: root.error ? root.errorString : root.assistiveText