2 files changed, 25 insertions, 1 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 26ce526f..8953888b 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -797,6 +797,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 newTween.tweenData.tweenID = 0;
                 newTween.tweenData.spanPosition = 0;
                 newTween.tweenData.easing = "none";
+                newTween.tweenData.initSelect = true;
                 newTween.tweenData.tweenedProperties = [];
                 newTween.tweenData.tweenedProperties["top"] = this.animatedElement.offsetTop + "px";
                 newTween.tweenData.tweenedProperties["left"] = this.animatedElement.offsetLeft + "px";
@@ -813,6 +814,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 newTween.tweenData.tweenID = this.nextKeyframe;
                 newTween.tweenData.spanPosition = clickPos - newTween.tweenData.spanWidth;
                 newTween.tweenData.easing = "none";
+                newTween.tweenData.initSelect = true;
                 newTween.tweenData.tweenedProperties = [];
                 newTween.tweenData.tweenedProperties["top"] = this.animatedElement.offsetTop + "px";
                 newTween.tweenData.tweenedProperties["left"] = this.animatedElement.offsetLeft + "px";
@@ -920,6 +922,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                     newTweenToInsert.tweenData.tweenID = this.tweens.length;
                     newTweenToInsert.tweenData.spanPosition = position - newTweenToInsert.tweenData.spanWidth;
                     newTweenToInsert.tweenData.tweenedProperties = [];
+                    newTweenToInsert.tweenData.easing = "none";
+                    newTweenToInsert.tweenData.initSelect = true;
                     newTweenToInsert.tweenData.tweenedProperties["top"] = this.animatedElement.offsetTop + "px";
                     newTweenToInsert.tweenData.tweenedProperties["left"] = this.animatedElement.offsetLeft + "px";
                     newTweenToInsert.tweenData.tweenedProperties["width"] = this.animatedElement.offsetWidth + "px";
@@ -999,6 +1003,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                             newTween.tweenData.keyFrameMillisec = 0;
                             newTween.tweenData.tweenID = 0;
                             newTween.tweenData.spanPosition = 0;
+                            newTween.tweenData.initSelect = false;
                             this.tweens.push(newTween);
                             this.createMatchingPositionSizeTween(newTween);
                         }
@@ -1016,6 +1021,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                             newTween.tweenData.keyFramePosition = clickPosition;
                             newTween.tweenData.keyFrameMillisec = currentMilliSec;
                             newTween.tweenData.tweenID = this.nextKeyframe;
+                            newTween.tweenData.initSelect = false;
                             newTween.tweenData.spanPosition =clickPosition - newTween.tweenData.spanWidth;
                             newTween.tweenData.easing = this.currentKeyframeRule[i].style.webkitAnimationName;
                             if (newTween.tweenData.easing == "") {
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index ae8acc57..0d189fba 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -170,9 +170,26 @@ var Tween = exports.Tween = Montage.create(Component, {
         
     },
 
+    _initSelect:{
+        value: null
+    },
+    initSelect:{
+        serializable:true,
+        get:function () {
+            return this._initSelect;
+        },
+        set:function (newVal) {
+            this._initSelect = newVal;
+            this.tweenData.initSelect = newVal;
+        }
+    },
+
     prepareForDraw:{
         value:function(){
-            this.keyframe.selectKeyframe();
+            if(this.initSelect){
+                this.keyframe.selectKeyframe();
+                this.initSelect = false;
+            }
         }
     },
 
@@ -200,6 +217,7 @@ var Tween = exports.Tween = Montage.create(Component, {
             this.tweenedProperties = this.tweenData.tweenedProperties;
             this.isTweenAnimated = this.tweenData.isTweenAnimated;
             this.easing = this.tweenData.easing;
+            this.initSelect = this.tweenData.initSelect;
             this.needsDraw = true;
         }
     },