diff --git a/assets/js/src/public.jsx b/assets/js/src/public.jsx
index 5148fc6e3f..9902d1013f 100644
--- a/assets/js/src/public.jsx
+++ b/assets/js/src/public.jsx
@@ -83,14 +83,6 @@ jQuery(($) => {
 
   function showForm(formDiv, showOverlay = false) {
     const form = formDiv.find('form');
-    const position = form.data('position');
-    formDiv.addClass(`mailpoet_form_position_${position}`);
-    const animation = form.data('animation');
-    if (animation !== '') {
-      formDiv.addClass(`mailpoet_form_animation_${animation}`);
-      formDiv.prev('.mailpoet_form_popup_overlay').addClass(`mailpoet_form_overlay_animation_${animation}`);
-      formDiv.prev('.mailpoet_form_popup_overlay').addClass('mailpoet_form_overlay_animation');
-    }
     const background = form.data('background-color');
     formDiv.css('background-color', background || 'white');
     let delay = form.data('delay');
diff --git a/views/form/front_end_form.html b/views/form/front_end_form.html
index 249ec26b40..30961dd9d6 100644
--- a/views/form/front_end_form.html
+++ b/views/form/front_end_form.html
@@ -7,10 +7,21 @@
     <%= before_title | raw %><%= title | raw %><%= after_title | raw %>
   <% endif %>
 
-  <div class="mailpoet_form_popup_overlay"></div>
+  <div class="
+    mailpoet_form_popup_overlay
+    <% if(animation != '') %>
+      mailpoet_form_overlay_animation_<%= animation %>
+      mailpoet_form_overlay_animation
+    <% endif %>
+  "></div>
   <div
     id="<%= form_html_id %>"
-    class="mailpoet_form mailpoet_form_<%= form_type %>"
+    class="
+      mailpoet_form
+      mailpoet_form_<%= form_type %>
+      mailpoet_form_position_<%= position %>
+      mailpoet_form_animation_<%= animation %>
+    "
     <% if(is_preview) %>
       data-is-preview="1"
       data-editor-url="<%= editor_url %>"
@@ -33,8 +44,6 @@
       class="mailpoet_form mailpoet_form_form mailpoet_form_<%= form_type %>"
       novalidate
       data-delay="<%= delay %>"
-      data-position="<%= position %>"
-      data-animation="<%= animation %>"
       data-exit-intent-enabled="<%= enableExitIntent %>"
       data-background-color="<%= backgroundColor %>"
       data-font-family="<%= fontFamily %>"