2 files changed, 20 insertions, 2 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 12b481de..50171260 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1215,8 +1215,24 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         boolContinue = false,
                         arrSelectedLayers = false,
                         arrCurrentElementsSelected = [];
+            var matchedValues = 0;
+
+            for(i=0;i<arrSelectedIndexesLength;i++){
+                for(j=0;j<currentLayersSelectedLength;j++){
+
+                    if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayerSelected[j]]){
+                        matchedValues+=1;
+                    }
+                }
+            }
+
+            if(matchedValues === arrSelectedIndexesLength){
+                return;
+            }
+
                 /*
                  // TODO: this should probably check to see if it actually needs to run.
+
                                         console.log(arrSelectedIndexes);
                         console.log(this.currentLayersSelected);
                 // Compare arrSelectedIndexes with this.currentLayersSelected
@@ -1258,7 +1274,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             }
 
             // Deselect any tweens
-            this.deselectTweens();
+                this.deselectTweens();
+
             
             // If we are actually going to be selecting things, create an empty array to use
             if (arrSelectedIndexesLength > 0) {
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index b8fe8b8d..369b270a 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -221,7 +221,8 @@ var Tween = exports.Tween = Montage.create(Component, {
 
     setTweenProperties:{
         value:function (eventDetail) {
-                if (eventDetail.source === "SelectionTool" || eventDetail.source === "timeline") {
+
+                if (eventDetail.source === "SelectionTool" || eventDetail.source === "timeline" || eventDetail.source === "pi") {
                     if(this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"]){
                         this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop + "px";
                     }