diff --git a/qml/Dialogs/CreateFolderDialog.qml b/qml/Dialogs/CreateFolderDialog.qml
index 1b4069a..8f0d2f0 100644
--- a/qml/Dialogs/CreateFolderDialog.qml
+++ b/qml/Dialogs/CreateFolderDialog.qml
@@ -75,6 +75,8 @@ Window {
         }
 
         RowLayout {
+            spacing: FishUI.Units.largeSpacing
+
             Button {
                 text: qsTr("Cancel")
                 Layout.fillWidth: true
diff --git a/qml/FolderGridView.qml b/qml/FolderGridView.qml
index 0c9c600..39a2961 100644
--- a/qml/FolderGridView.qml
+++ b/qml/FolderGridView.qml
@@ -70,6 +70,10 @@ GridView {
         positioner.reset()
     }
 
+    onCountChanged: {
+        positioner.reset()
+    }
+
     function effectiveNavDirection(flow, layoutDirection, direction) {
         if (direction === Qt.LeftArrow) {
             if (flow === GridView.FlowLeftToRight) {