Merge branch 'refs/heads/timeline-local' into TimelineUber

1 files changed, 4 insertions, 3 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 3bcc1401..f9edfca6 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -710,13 +710,14 @@ var Layer = exports.Layer = Montage.create(Component, {
         handleSelectorEditableBlur : {
                 value: function(event) {
                 this.titleSelector.scrollLeft = 0;
+                this.handleSelectorEditableChange(event);
                 }
         },
         handleSelectorEditableChange: {
                 value: function(event) {
-                        var newVal = "ONTD";
-                        if (this._layerEditable.value !== "") {
-                                newVal = this._layerEditable.value;
+                        var newVal = this._layerEditable.enteredValue;
+                        if (this._layerEditable.enteredValue.length === 0) {
+                                newVal = this._layerEditable._preEditValue;
                         }
                         this.dynamicLayerName.value = newVal;
                         this.layerName = newVal;