1 files changed, 10 insertions, 6 deletions

diff --git a/node_modules/montage/ui/composer/key-composer.js b/node_modules/montage/ui/composer/key-composer.js
index 9d2c0f14..015ab115 100644
--- a/node_modules/montage/ui/composer/key-composer.js
+++ b/node_modules/montage/ui/composer/key-composer.js
@@ -103,9 +103,9 @@ var KeyComposer = exports.KeyComposer = Montage.create(Composer, /** @lends modu
       @default null
     */
     identifier: {
-        get: function() {
-            return this._identifier;
-        },
+       get: function() {
+           return this._identifier;
+       },
         set: function(identifier) {
             this._identifier = identifier;
         }
@@ -234,7 +234,7 @@ var KeyComposer = exports.KeyComposer = Montage.create(Composer, /** @lends modu
                         this._keyRegistered = true;
                     }
                 } else if (component && typeof component.addComposer !== "function") {
-                    // this keyComposer is associated with an element, let's make it a global key
+                    // this keyComposer is not associated with an element, let's make it a global key
                     if (!this.element) {
                         this.element = window;
                     }
@@ -264,11 +264,15 @@ var KeyComposer = exports.KeyComposer = Montage.create(Composer, /** @lends modu
         value: function() {
             var component = this.component;
 
+            if (this.identifier === null) {
+                this.identifier = Montage.getInfoForObject(this).label;
+            }
+
             if (component) {
                 if (typeof component.addComposer == "function") {
                     component.addComposer(this);
                 } else if (!this._isLoaded) {
-                    // this keyComposer is associated with an element, let's make it a global key
+                    // this keyComposer is not associated with an element, let's make it a global key
                     if (!this.element) {
                         this.element = window;
                     }
@@ -284,7 +288,7 @@ var KeyComposer = exports.KeyComposer = Montage.create(Composer, /** @lends modu
 /**
  @class KeyManagerProxy
  @classdesc Provide a proxy for lazy load of module:montage/core/event/key-manager.KeyManager.
- @extends module:montage
+ @extends module:montage/core/core.Montage
  @private
  */
 var _keyManagerProxy= null;