diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextViewEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextViewEntryField.swift
index a39e1c97..a76e9451 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextViewEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextViewEntryField.swift
@@ -115,30 +115,6 @@ open class TextViewEntryField: VDS.TextArea, VDSMoleculeViewProtocol, ObservingT
             }.store(in: &subscribers)
     }
         
-    open override func updateView() {
-        super.updateView()
-        switch viewModel.type {
-        case .secure, .password:
-            textView.isSecureTextEntry = true
-            textView.shouldMaskWhileRecording = true
-
-        case .numberSecure:
-            textView.isSecureTextEntry = true
-            textView.keyboardType = .numberPad
-            textView.shouldMaskWhileRecording = true
-
-        case .number:
-            textView.keyboardType = .numberPad
-            
-        case .email:
-            textView.keyboardType = .emailAddress
-//uncomment out once inputField branch is merged and update this logic
-//        case .securityCode, .creditCard:
-//            textView.shouldMaskWhileRecording = true
-
-        default: break
-        }
-    }
     open func viewModelDidUpdate() {
     
         text = viewModel.text
@@ -171,6 +147,28 @@ open class TextViewEntryField: VDS.TextArea, VDSMoleculeViewProtocol, ObservingT
             isEditting = true
         }
         
+        switch viewModel.type {
+        case .secure, .password:
+            textView.isSecureTextEntry = true
+            textView.shouldMaskWhileRecording = true
+
+        case .numberSecure:
+            textView.isSecureTextEntry = true
+            textView.keyboardType = .numberPad
+            textView.shouldMaskWhileRecording = true
+
+        case .number:
+            textView.keyboardType = .numberPad
+            
+        case .email:
+            textView.keyboardType = .emailAddress
+//uncomment out once inputField branch is merged and update this logic
+//        case .securityCode, .creditCard:
+//            textView.shouldMaskWhileRecording = true
+
+        default: break
+        }
+        
         /// append any internal rules:
         viewModel.rules = rules