1 files changed, 7 insertions, 1 deletions

diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 85fdfdc9..d41ad74f 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -229,7 +229,13 @@ var Tween = exports.Tween = Montage.create(Component, {
     prepareForDraw:{
         value:function(){
             if(this.initSelect){
-                this.keyframe.selectKeyframe();
+                // Select our new keyframe only if our parent is a main track.
+                // TODO: When we decouple all property tracks, this will go away.
+                if (typeof(this.parentComponent.parentComponent.trackType) === "undefined") {
+                    if (this.tweenID > 0) {
+                        this.keyframe.selectKeyframe();
+                    }
+                }
                 this.initSelect = false;
             }
         }