diff --git a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/classic/activity/FeedbackScreenCatalogActivity.kt b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/classic/activity/FeedbackScreenCatalogActivity.kt
index d3e33a347..859ff6cc4 100644
--- a/catalog/src/main/java/com/telefonica/mistica/catalog/ui/classic/activity/FeedbackScreenCatalogActivity.kt
+++ b/catalog/src/main/java/com/telefonica/mistica/catalog/ui/classic/activity/FeedbackScreenCatalogActivity.kt
@@ -2,7 +2,6 @@ package com.telefonica.mistica.catalog.ui.classic.activity
 
 import android.content.Intent
 import android.os.Bundle
-import android.view.View
 import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
 import com.telefonica.mistica.catalog.R
@@ -49,14 +48,14 @@ class FeedbackScreenCatalogActivity : AppCompatActivity() {
             firstButtonLoadingText?.let { setFeedbackFirstButtonLoadingText(it) }
             secondButtonText?.let { setFeedbackSecondButtonText(it) }
             showSecondButtonAsLink?.let { setFeedbackSecondButtonAsLink(it) }
-            setFirstButtonOnClick(View.OnClickListener {
+            setFirstButtonOnClick {
                 if (showLoadingInButton == true) {
                     setIsLoading(true)
                     handler.postDelayed({ setIsLoading(false) }, RETRY_DELAY)
                 } else {
                     finish()
                 }
-            })
+            }
             customIcon?.let { setCustomIcon(it) }
             customAnimation?.let { setCustomAnimation(it) }
             setShouldAnimateOnAttached(shouldAnimateOnAttached)
diff --git a/library/src/main/java/com/telefonica/mistica/feedback/screen/view/FeedbackScreenView.kt b/library/src/main/java/com/telefonica/mistica/feedback/screen/view/FeedbackScreenView.kt
index 999c4a317..0585bec1f 100644
--- a/library/src/main/java/com/telefonica/mistica/feedback/screen/view/FeedbackScreenView.kt
+++ b/library/src/main/java/com/telefonica/mistica/feedback/screen/view/FeedbackScreenView.kt
@@ -242,7 +242,6 @@ class FeedbackScreenView : ConstraintLayout {
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         configureView()
-        animateViewsOnFirstLayout()
     }
 
     private fun configureView() {
@@ -251,6 +250,7 @@ class FeedbackScreenView : ConstraintLayout {
         configureTexts()
         configureCustomContentView()
         configureButtons()
+        animateViewsOnFirstLayout()
     }
 
     private fun configureBackground() {