diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift
index d5648342..aff5ec75 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift
@@ -211,7 +211,8 @@ import UIKit
         
         let digitBox = DigitBox()
         digitBox.isAccessibilityElement = true
-        digitBox.digitField.inputAccessoryView = UIToolbar.getToolbarWithDoneButton(delegate: self, action: #selector(dismissFieldInput))
+        digitBox.digitField.inputAccessoryView = UIToolbar.getToolbarWithDoneButton(delegate: observingTextFieldDelegate ?? self,
+                                                                                    action: #selector(observingTextFieldDelegate?.dismissFieldInput))
         digitBox.digitField.delegate = self
         digitBox.digitBoxDelegate = self
         return digitBox