diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml
index e0d689b6bdfeb..529181d6c1b32 100644
--- a/src/gui/ResolveConflictsDialog.qml
+++ b/src/gui/ResolveConflictsDialog.qml
@@ -46,10 +46,10 @@ ApplicationWindow {
 
     ColumnLayout {
         anchors.fill: parent
-        anchors.leftMargin: 20
-        anchors.rightMargin: 20
-        anchors.bottomMargin: 20
-        anchors.topMargin: 20
+        anchors.leftMargin: 10
+        anchors.rightMargin: 10
+        anchors.bottomMargin: 5
+        anchors.topMargin: 10
         spacing: 15
         z: 2
 
@@ -70,7 +70,7 @@ ApplicationWindow {
 
         RowLayout {
             Layout.fillWidth: true
-            Layout.topMargin: 15
+            Layout.topMargin: 5
 
             CheckBox {
                 id: selectExisting
diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index 03c7bf932fcd7..11c49a52aa66d 100644
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -154,7 +154,7 @@ QtObject {
     readonly property int bigFontPixelSizeResolveConflictsDialog: 20
     readonly property int fontPixelSizeResolveConflictsDialog: 15
     readonly property int minimumWidthResolveConflictsDialog: 600
-    readonly property int minimumHeightResolveConflictsDialog: 800
+    readonly property int minimumHeightResolveConflictsDialog: 300
 
     readonly property double smallIconScaleFactor: 0.6