diff --git a/electrum/gui/qml/components/CloseChannelDialog.qml b/electrum/gui/qml/components/CloseChannelDialog.qml
index 24631ef3c..176277486 100644
--- a/electrum/gui/qml/components/CloseChannelDialog.qml
+++ b/electrum/gui/qml/components/CloseChannelDialog.qml
@@ -62,6 +62,15 @@ ElDialog {
                     text: channeldetails.name
                 }
 
+                Label {
+                    text: qsTr('Short channel ID')
+                    color: Material.accentColor
+                }
+
+                Label {
+                    text: channeldetails.short_cid
+                }
+
                 Label {
                     text: qsTr('Remote node ID')
                     Layout.columnSpan: 2
@@ -82,20 +91,12 @@ ElDialog {
                     }
                 }
 
-                Label {
-                    text: qsTr('Short channel ID')
-                    color: Material.accentColor
-                }
-
-                Label {
-                    text: channeldetails.short_cid
-                }
-
                 Item { Layout.preferredHeight: constants.paddingMedium; Layout.preferredWidth: 1; Layout.columnSpan: 2 }
 
                 InfoTextArea {
                     Layout.columnSpan: 2
                     Layout.fillWidth: true
+                    Layout.bottomMargin: constants.paddingLarge
                     text: channeldetails.message_force_close
                 }
 
diff --git a/electrum/gui/qml/components/InvoiceDialog.qml b/electrum/gui/qml/components/InvoiceDialog.qml
index 941349d01..a414b813f 100644
--- a/electrum/gui/qml/components/InvoiceDialog.qml
+++ b/electrum/gui/qml/components/InvoiceDialog.qml
@@ -53,7 +53,6 @@ ElDialog {
                 InfoTextArea {
                     Layout.columnSpan: 2
                     Layout.fillWidth: true
-                    Layout.topMargin: constants.paddingLarge
                     Layout.bottomMargin: constants.paddingLarge
                     visible: invoice.userinfo
                     text: invoice.userinfo
diff --git a/electrum/gui/qml/qechanneldetails.py b/electrum/gui/qml/qechanneldetails.py
index 61f39479a..8647066c7 100644
--- a/electrum/gui/qml/qechanneldetails.py
+++ b/electrum/gui/qml/qechanneldetails.py
@@ -154,7 +154,7 @@ class QEChannelDetails(QObject, QtEventListener):
 
     @pyqtProperty(str, notify=channelChanged)
     def message_force_close(self, notify=channelChanged):
-        return _(messages.MSG_REQUEST_FORCE_CLOSE)
+        return _(messages.MSG_REQUEST_FORCE_CLOSE).strip()
 
     @pyqtProperty(bool, notify=channelChanged)
     def isBackup(self):