diff --git a/ui/source/effects.core.js b/ui/source/effects.core.js
index b44a72274..dca9f28ce 100644
--- a/ui/source/effects.core.js
+++ b/ui/source/effects.core.js
@@ -5,7 +5,7 @@
   $.extend($.effects, {
     save: function(el, set) {
       for(var i=0;i<set.length;i++) {
-        if(set[i] !== null) $.data(el[0], "ec.storage."+set[i], el.css(set[i]));
+        if(set[i] !== null) $.data(el[0], "ec.storage."+set[i], el[0].style[set[i]]);
       }
     },
     restore: function(el, set) {
diff --git a/ui/source/effects.highlight.js b/ui/source/effects.highlight.js
index 8eeabe39e..404b1b7fd 100644
--- a/ui/source/effects.highlight.js
+++ b/ui/source/effects.highlight.js
@@ -10,13 +10,14 @@
       // Set options
       var mode = $.effects.setMode(el, o.options.mode || 'show'); // Set Mode
       var color = o.options.color || "#ffff99"; // Default highlight color
+      var oldColor = el.css("backgroundColor");
       
       // Adjust
       $.effects.save(el, props); el.show(); // Save & Show
       el.css({backgroundImage: 'none', backgroundColor: color}); // Shift
       
       // Animation
-      var animation = {backgroundColor: $.data(this, "ec.storage.backgroundColor")};
+      var animation = {backgroundColor: oldColor };
       if (mode == "hide") animation['opacity'] = 0;
       
       // Animate