diff --git a/MVMCoreUI/BaseClasses/TextView.swift b/MVMCoreUI/BaseClasses/TextView.swift
index b16a2529..191806bb 100644
--- a/MVMCoreUI/BaseClasses/TextView.swift
+++ b/MVMCoreUI/BaseClasses/TextView.swift
@@ -471,7 +471,8 @@ extension TextView: MoleculeViewProtocol {
         
         if isEditable {
             FormValidator.setupValidation(for: model, delegate: delegateObject?.formHolderDelegate)
-            inputAccessoryView = UIToolbar.getToolbarWithDoneButton(delegate: delegateObject?.uiTextViewDelegate,
+            let observingDelegate = delegateObject?.uiTextViewDelegate ?? self
+            inputAccessoryView = UIToolbar.getToolbarWithDoneButton(delegate: observingDelegate,
                                                                     action: #selector(dismissFieldInput))
             
             if (model.selected ?? false) && !model.wasInitiallySelected {