Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	Used Theirs, doesn't matter, code block is in commented-out section.

1 files changed, 5 insertions, 3 deletions

diff --git a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
index 509ca565..f53937e6 100644
--- a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
+++ b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
@@ -39,11 +39,13 @@ exports.RuleListContainer = Montage.create(Component, {
         value: function(selection) {
             var list = this._getListForSelection(selection);
 
-            if(!list) {
+            if(list) {
+                this.displayedList = list;
+                this.update();
+            } else {
                 list = this.add(selection);
+                this.displayedList = list;
             }
-
-            this.displayedList = list;
         }
     },