diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js
index 2953c08df..1a81222ab 100644
--- a/src/commands/view/SelectComponent.js
+++ b/src/commands/view/SelectComponent.js
@@ -250,7 +250,7 @@ module.exports = {
     if(!model || !model.get('badgable'))
       return;
     var badge = this.getBadge();
-    badge.innerHTML = model.getName();
+    badge.innerHTML = model.getCurrentName();
     var bStyle = badge.style;
     var u = 'px';
     bStyle.display = 'block';
diff --git a/src/dom_components/model/Component.js b/src/dom_components/model/Component.js
index 9444d8662..d614f258f 100644
--- a/src/dom_components/model/Component.js
+++ b/src/dom_components/model/Component.js
@@ -260,6 +260,10 @@ module.exports = Backbone.Model.extend({
     return this.name;
   },
 
+  getCurrentName() {
+    return this.get('custom-name') || this.getName();
+  },
+
   /**
    * Return HTML string of the component
    * @param {Object} opts Options