diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
index 9d7c8927..41254355 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
@@ -259,6 +259,7 @@ import UIKit
             observingTextFieldDelegate?.isInvalid?(textfield: self)
         }
     }
+    
     /// Executes on UITextField.textDidBeginEditingNotification
     @objc func startEditing() {
         isSelected = true
@@ -278,6 +279,7 @@ import UIKit
 
         // Don't show error till user starts typing.
         guard text?.count ?? 0 != 0 else {
+            showError = false
             return
         }
 
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
index 546b5c30..35e25075 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
@@ -71,7 +71,7 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
     
     /// The text of this textView.
     open override var text: String? {
-        get { return textView.text }
+        get { return textViewEntryFieldModel?.text }
         set {
             textView.text = newValue
             textViewEntryFieldModel?.text = newValue
@@ -207,8 +207,19 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
     
     /// Executes on UITextView.textDidEndEditingNotification
     @objc func endInputing() {
-        resignFirstResponder()
         isSelected = false
+        resignFirstResponder()
+
+        // Don't show error till user starts typing.
+        guard text?.count ?? 0 != 0 else {
+            showError = false
+            return
+        }
+
+        if let isValid = (model as? TextEntryFieldModel)?.isValid {
+            self.isValid = isValid
+        }
+        
         showError = !isValid
     }