diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
index f16c4e12..546b5c30 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
@@ -104,7 +104,6 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
         leadingConstraint?.constant = constant
         trailingConstraint?.constant = constant
         bottomConstraint?.constant = constant
-        layoutIfNeeded()
     }
     
     //--------------------------------------------------
@@ -242,7 +241,7 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
         textView.placeholder = model.placeholder ?? ""
         textView.placeholderFontStyle = model.placeholderFontStyle
         textView.placeholderTextColor = model.placeholderTextColor.uiColor
-        
+        textView.setPlaceholderIfAvailable()
         
         switch model.type {
         case .secure, .password:
@@ -273,9 +272,8 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
             adjustMarginConstraints(constant: 0)
         }
         
-        textView.setPlaceholderIfAvailable()
-//        if !model.enabled {
-//            isEnabled = false
-//        }
+        if !model.enabled {
+            isEnabled = false
+        }
     }
 }