diff --git a/src/ui/ReloadPopup.qml b/src/ui/ReloadPopup.qml
index 81fa1ee2..5f2a9bd7 100644
--- a/src/ui/ReloadPopup.qml
+++ b/src/ui/ReloadPopup.qml
@@ -118,6 +118,7 @@ PanelWindow {
 		anchors.fill: parent
 		color: palette.active.window
 		border.color: root.failed ? "#b53030" : palette.active.accent
+		border.width: 1
 
 		radius: 10
 		margin: 10
diff --git a/src/widgets/WrapperRectangle.qml b/src/widgets/WrapperRectangle.qml
index 90c7b3a4..e769d686 100644
--- a/src/widgets/WrapperRectangle.qml
+++ b/src/widgets/WrapperRectangle.qml
@@ -58,6 +58,12 @@ Rectangle {
 	/// See @@WrapperManager.child for details.
 	property alias child: manager.child
 
+	// Reading the border property implicitly sets border width to 1.
+	// Setting it to 0 here means the user will also have to set border.width
+	// even if they just want 1, but it prevents adding unexpected padding
+	// and works around QTBUG-137166 otherwise.
+	border.width: 0
+
 	MarginWrapperManager {
 		id: manager
 		extraMargin: (root.contentInsideBorder ? root.border.width : 0) + root.extraMargin