diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift
index cee67c16..336d5da6 100644
--- a/MVMCoreUI/BaseControllers/ViewController.swift
+++ b/MVMCoreUI/BaseControllers/ViewController.swift
@@ -566,6 +566,11 @@ import UIKit
     // MARK: - UITextViewDelegate
     //--------------------------------------------------
     
+    public func textViewShouldBeginEditing(_ textView: UITextView) -> Bool {
+        selectedField = textView
+        return true
+    }
+    
     open func textViewDidBeginEditing(_ textView: UITextView) {
         selectedField = textView
     }