diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 24dc94800..57a6ba19e 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -951,8 +951,9 @@ class AttributeEnum extends AttributeString
 	public function GetAsHTML($sValue)
 	{
 		$sLabel = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue, $sValue);
+		$sDescription = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue.'+', $sValue);
 		// later, we could imagine a detailed description in the title
-		return "<span title=\"\">".parent::GetAsHtml($sLabel)."</span>";
+		return "<span title=\"$sDescription\">".parent::GetAsHtml($sLabel)."</span>";
 	}
 
 	public function GetEditValue($sValue)
diff --git a/core/dbobject.class.php b/core/dbobject.class.php
index e6a2c3788..b870566d9 100644
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -524,7 +524,6 @@ abstract class DBObject
 		else
 		{
 			return $this->Get($sStateAttCode);
-			return MetaModel::GetStateLabel(get_class($this), $sStateAttCode);
 		}
 	}
 
diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index bef56b808..b3a51bc9d 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -811,7 +811,9 @@ abstract class MetaModel
 	public static function GetStateLabel($sClass, $sStateValue)
 	{
 		$sStateAttrCode = self::GetStateAttributeCode($sClass);
-		return Dict::S("Class:$sClass/Attribute:$sStateAttrCode/Value:$sStateValue", $sStateValue);
+		$oAttDef = self::GetAttributeDef($sClass, $sStateAttrCode);
+		// Be consistent with what is done for enums, since states are defined as enums...
+		return Dict::S("Class:".$oAttDef->GetHostClass()."/Attribute:$sStateAttrCode/Value:$sStateValue");
 
 		// I've decided the current implementation, because I need
 		// to get the description as well -GetAllowedValues does not render the description,