diff --git a/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts b/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts
index a07d6f5d1..0f8f49b34 100644
--- a/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts
+++ b/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts
@@ -103,7 +103,8 @@ export class CreateEditEndpointComponent implements AfterViewChecked, OnDestroy
             !this.onGoing &&
             this.targetForm &&
             this.targetForm.valid &&
-            this.editable;
+            this.editable &&
+            (this.targetNameHasChanged || this.endpointHasChanged);
     }
 
     public get inProgress(): boolean {