diff --git a/frontend/src/components/Controls/Grid.vue b/frontend/src/components/Controls/Grid.vue
index 41188e84..78a4f403 100644
--- a/frontend/src/components/Controls/Grid.vue
+++ b/frontend/src/components/Controls/Grid.vue
@@ -70,6 +70,7 @@
           :delay="isTouchScreenDevice() ? 200 : 0"
           group="rows"
           item-key="name"
+          @end="reorder"
         >
           <template #item="{ element: row, index }">
             <div
@@ -515,6 +516,13 @@ const deleteRows = () => {
   selectedRows.clear()
 }
 
+const reorder = () => {
+  rows.value.forEach((row, index) => {
+    row.idx = index + 1
+  })
+}
+
+
 function fieldChange(value, field, row) {
   triggerOnChange(field.fieldname, value, row)
 }
diff --git a/frontend/src/components/Settings/General/HomeActions.vue b/frontend/src/components/Settings/General/HomeActions.vue
index fafdbdf8..eca55dc2 100644
--- a/frontend/src/components/Settings/General/HomeActions.vue
+++ b/frontend/src/components/Settings/General/HomeActions.vue
@@ -17,8 +17,8 @@
           :label="__('Update')"
           icon-left="plus"
           variant="solid"
-          :disabled="!settings.isDirty"
-          :loading="settings.loading"
+          :disabled="!document.isDirty"
+          :loading="document.loading"
           @click="updateSettings"
         />
       </div>