diff --git a/main/inc/lib/skill.lib.php b/main/inc/lib/skill.lib.php
index 546eba822a..37e1af9815 100755
--- a/main/inc/lib/skill.lib.php
+++ b/main/inc/lib/skill.lib.php
@@ -486,7 +486,7 @@ class Skill extends Model
             }
         }
 
-        $sql = "SELECT s.id, s.name, s.description, ss.parent_id, ss.relation_type, s.icon
+        $sql = "SELECT s.id, s.name, s.description, ss.parent_id, ss.relation_type, s.icon, s.short_code
                 FROM {$this->table} s INNER JOIN {$this->table_skill_rel_skill} ss ON (s.id = ss.skill_id) $id_condition
                 ORDER BY ss.id, ss.parent_id";
 
@@ -811,9 +811,16 @@ class Skill extends Model
                     $skill['parent_id'] = 'root';
                 }
 
-                // because except main keys (id, name, children) others keys are not saved while in the space tree
+                // because except main keys (id, name, children) others keys
+                // are not saved while in the space tree
                 $skill['data'] = array('parent_id' => $skill['parent_id']);
 
+                // If a short code was defined, send the short code to replace
+                // skill name (to shorten the text in the wheel)
+                if (!empty($skill['short_code'])) {
+                    $skill['data']['name'] = $skill['short_code'];
+                }
+
                 //In order to paint all members of a family with the same color
                 if (empty($skill_id)) {
                     if ($skill['parent_id'] == 1) {