diff --git a/src/api/forms/components/FormProperties.vue b/src/api/forms/components/FormProperties.vue
index f29370f42eb..efe219a803f 100644
--- a/src/api/forms/components/FormProperties.vue
+++ b/src/api/forms/components/FormProperties.vue
@@ -158,7 +158,7 @@ export default {
       this.$emit('on-save');
     },
     handleKeyDown({ key }) {
-      if (key === 'Enter') {
+      if (key === 'Enter' && !this.isInvalid) {
         this.onSave();
       } else if (key === 'Escape') {
         this.onCancel();