diff --git a/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.html b/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.html
index 17de770c0..d09362254 100644
--- a/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.html
+++ b/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.html
@@ -83,8 +83,8 @@ <h1>ArcGIS Configuration</h1>
       </div>
     </mat-card-content>
     <mat-card-actions>
-      <button mat-button matDialogClose (click)="cancelEdit()">CANCEL</button>
       <button mat-flat-button color="primary" matDialogClose (click)="saveEdit()">SAVE</button>
+      <button mat-button matDialogClose (click)="cancelEdit()">CANCEL</button>
     </mat-card-actions>
   </mat-card>
     <arc-layer [config]="config" (configChanged)="configChanged($event)"></arc-layer>
@@ -798,8 +798,8 @@ <h2 matDialogTitle>Attributes Configuration</h2>
     </div>
   </mat-dialog-content>
   <mat-dialog-actions align="end">
-    <button mat-button matDialogClose (click)="cancelEdit()">CANCEL</button>
     <button mat-flat-button color="primary" matDialogClose (click)="saveEdit()">SAVE</button>
+    <button mat-button matDialogClose (click)="cancelEdit()">CANCEL</button>
   </mat-dialog-actions>
 </ng-template>
 <ng-template #deleteFieldDialog let-data>
diff --git a/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.ts b/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.ts
index a927819f1..33717ff32 100644
--- a/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.ts
+++ b/plugins/arcgis/web-app/projects/main/src/lib/arc-admin/arc-admin.component.ts
@@ -299,6 +299,7 @@ export class ArcAdminComponent implements OnInit {
 
   cancelEdit() {
     console.log('Canceled configuration edit')
+    this.editConfig = this.copyConfig();
   }
 
   keys(value: any): string[] {