diff --git a/src/components/map/MapSettings.js b/src/components/map/MapSettings.js
index 79997cf..9e5ccc3 100644
--- a/src/components/map/MapSettings.js
+++ b/src/components/map/MapSettings.js
@@ -63,7 +63,7 @@ function MapSettings({
 
     let inset = map.grid.inset;
 
-    if (value > 0) {
+    if (gridX > 0) {
       const gridScale =
         ((inset.bottomRight.x - inset.topLeft.x) * map.width) / gridX;
       inset.bottomRight.y = (value * gridScale) / map.height;
diff --git a/src/modals/EditMapModal.js b/src/modals/EditMapModal.js
index af51f70..044a1d6 100644
--- a/src/modals/EditMapModal.js
+++ b/src/modals/EditMapModal.js
@@ -50,13 +50,13 @@ function EditMapModal({ isOpen, onDone, map, mapState }) {
     if (!isEmpty(mapSettingChanges) || !isEmpty(mapStateSettingChanges)) {
       // Ensure grid values are positive
       let verifiedChanges = { ...mapSettingChanges };
-      if ("gridX" in verifiedChanges) {
-        verifiedChanges.gridX = verifiedChanges.gridX || 1;
+      if ("grid" in verifiedChanges && "size" in verifiedChanges.grid) {
+        verifiedChanges.grid.size.x = verifiedChanges.grid.size.x || 1;
       }
-      if ("gridY" in verifiedChanges) {
-        verifiedChanges.gridY = verifiedChanges.gridY || 1;
+      if ("grid" in verifiedChanges && "size" in verifiedChanges.grid) {
+        verifiedChanges.grid.size.y = verifiedChanges.grid.size.y || 1;
       }
-      await updateMap(map.id, verifiedChanges);
+      await updateMap(map.id, mapSettingChanges);
       await updateMapState(map.id, mapStateSettingChanges);
 
       setMapSettingChanges({});