diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java
index 89cdc9705da8ec1f7ffd597b56f39461f18986b3..10a614b69d17aa5cc70ebd7630ed7232138dc961 100644
--- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java
+++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java
@@ -8,6 +8,7 @@ import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.google.common.base.Strings;
 import org.springframework.stereotype.Component;
 
+import javax.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -35,9 +36,9 @@ public class PropertyResolver implements ConfigTextResolver {
     oldKeyMapItem.remove("");
 
     String[] newItems = configText.split(ITEM_SEPARATOR);
-
-    if (isHasRepeatKey(newItems)) {
-      throw new BadRequestException("config text has repeat key please check.");
+    Set<String> repeatKeys = new HashSet<>();
+    if (isHasRepeatKey(newItems, repeatKeys)) {
+      throw new BadRequestException(String.format("Config text has repeated keys: %s, please check your input.", repeatKeys.toString()));
     }
 
     ItemChangeSets changeSets = new ItemChangeSets();
@@ -72,24 +73,24 @@ public class PropertyResolver implements ConfigTextResolver {
     return changeSets;
   }
 
-  private boolean isHasRepeatKey(String[] newItems) {
+  private boolean isHasRepeatKey(String[] newItems, @NotNull Set<String> repeatKeys) {
     Set<String> keys = new HashSet<>();
     int lineCounter = 1;
-    int keyCount = 0;
     for (String item : newItems) {
       if (!isCommentItem(item) && !isBlankItem(item)) {
-        keyCount++;
         String[] kv = parseKeyValueFromItem(item);
         if (kv != null) {
-          keys.add(kv[0].toLowerCase());
+          String key = kv[0].toLowerCase();
+          if(!keys.add(key)){
+            repeatKeys.add(key);
+          }
         } else {
           throw new BadRequestException("line:" + lineCounter + " key value must separate by '='");
         }
       }
       lineCounter++;
     }
-
-    return keyCount > keys.size();
+    return !repeatKeys.isEmpty();
   }
 
   private String[] parseKeyValueFromItem(String item) {
diff --git a/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js b/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
index 66b5e46d0e30b9813a850bf2c37a52cec3ec4097..7b4f88ae0cc3b671156aa6863366093b7c2a19c4 100644
--- a/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
+++ b/apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js
@@ -745,7 +745,6 @@ function directive($window, $translate, toastr, AppUtil, EventManager, Permissio
                         }
                     );
                 namespace.commited = true;
-                toggleTextEditStatus(namespace);
             }
 
             function syntaxCheck(namespace) {