diff --git a/src/main/main.ts b/src/main/main.ts
index 0f54031e..48d5ecef 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -85,7 +85,7 @@ else {
 
    ipcMain.on('refresh-theme-settings', () => {
       const appTheme = persistentStore.get('application_theme');
-      if(isWindows){
+      if (isWindows) {
          mainWindow.setTitleBarOverlay({
             color: appTheme === 'dark' ? '#3f3f3f' : '#fff',
             symbolColor: appTheme === 'dark' ? '#fff' : '#000'
diff --git a/src/renderer/components/WorkspaceTabPropsTable.vue b/src/renderer/components/WorkspaceTabPropsTable.vue
index d279538f..f7c378f7 100644
--- a/src/renderer/components/WorkspaceTabPropsTable.vue
+++ b/src/renderer/components/WorkspaceTabPropsTable.vue
@@ -440,6 +440,7 @@ export default {
          const changes = [];
          this.localFields.forEach((field, i) => {
             const originalField = this.originalFields.find(oField => oField._antares_id === field._antares_id);
+            if (!originalField) return;
             const after = i > 0 ? this.localFields[i - 1].name : false;
             const orgName = originalField.name;