diff --git a/administrator/components/com_fields/src/Table/FieldTable.php b/administrator/components/com_fields/src/Table/FieldTable.php
index ad8b124da1a49..949b43c99e4a8 100644
--- a/administrator/components/com_fields/src/Table/FieldTable.php
+++ b/administrator/components/com_fields/src/Table/FieldTable.php
@@ -154,7 +154,7 @@ public function check()
         // Verify that the name is unique
         $table = new self($this->_db, $this->getDispatcher());
 
-        if ($table->load(['name' => $this->name]) && ($table->id != $this->id || $this->id == 0)) {
+        if ($table->load(['name' => $this->name, 'context' => $this->context]) && ($table->id != $this->id || $this->id == 0)) {
             $this->setError(Text::_('COM_FIELDS_ERROR_UNIQUE_NAME'));
 
             return false;
diff --git a/administrator/language/en-GB/com_fields.ini b/administrator/language/en-GB/com_fields.ini
index 1799bf0d9d165..4349918e213ae 100644
--- a/administrator/language/en-GB/com_fields.ini
+++ b/administrator/language/en-GB/com_fields.ini
@@ -7,7 +7,7 @@ COM_FIELDS="Fields"
 COM_FIELDS_BATCH_GROUP_LABEL="To Move or Copy your selection please select a group."
 COM_FIELDS_BATCH_GROUP_OPTION_NONE="- No Group -"
 COM_FIELDS_CHOOSE_CONTEXT_LABEL="Context"
-COM_FIELDS_ERROR_UNIQUE_NAME="Another Field has the same name (remember it may be a trashed item or it may be already present as a custom field in another extension)."
+COM_FIELDS_ERROR_UNIQUE_NAME="Another Field has the same name (remember it may be a trashed item)."
 COM_FIELDS_FIELD_CLASS_DESC="The class attributes of the field in the edit form. If multiple classes are needed, list them with spaces."
 COM_FIELDS_FIELD_CLASS_LABEL="Field Class"
 COM_FIELDS_FIELD_DEFAULT_VALUE_LABEL="Default Value"