diff --git a/website_animate/static/src/js/o_animate.editor.js b/website_animate/static/src/js/o_animate.editor.js
index 5adf905aa..a757d6375 100644
--- a/website_animate/static/src/js/o_animate.editor.js
+++ b/website_animate/static/src/js/o_animate.editor.js
@@ -22,6 +22,12 @@ function forceAnimation() {
 
 //  Animations
 sOptions.registry.o_animate = sOptions.Class.extend({
+    /**
+     * @override
+     */
+    async onBuilt() {
+        this.$target[0].classList.toggle('o_animate_preview', this.$target[0].classList.contains('o_animate'));
+    },
 
     //--------------------------------------------------------------------------
     // Options
diff --git a/website_animate/static/src/js/o_animate.frontend.js b/website_animate/static/src/js/o_animate.frontend.js
index 886f39290..51e508240 100644
--- a/website_animate/static/src/js/o_animate.frontend.js
+++ b/website_animate/static/src/js/o_animate.frontend.js
@@ -14,7 +14,7 @@ var WebsiteAnimate = {
     start: function () {
         var self   = this;
         self.$scrollingElement = $().getScrollingElement();
-        self.items = $(".o_animate");
+        self.items = $("#wrapwrap .o_animate");
         self.items.each(function () {
             var $el = $(this);
             // Set all monitored elements to initial state
@@ -48,7 +48,7 @@ var WebsiteAnimate = {
             var direction = (windowTop < lastScroll) ? -1 : 1;
             lastScroll = windowTop;
 
-            $(".o_animate").each(function () {
+            $("#wrapwrap .o_animate").each(function () {
                 var $el       = $(this);
                 var elHeight  = $el.height();
                 var elOffset  = direction * Math.max((elHeight * self.offsetRatio), self.offsetMin);
@@ -140,7 +140,7 @@ publicWidget.registry.WebsiteAnimate = publicWidget.Widget.extend({
         WebsiteAnimate.start();
         // Then we render all the elements, the ones which are invisible
         // in state 0 (like fade_in for example) will stay invisible.
-        $(".o_animate").css("visibility", "visible");
+        this.$target.find('.o_animate').css("visibility", "visible");
 
         return this._super.apply(this, arguments);
     },