diff --git a/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift b/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
index 3d0b69a5..9ecbbe6e 100644
--- a/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
@@ -207,7 +207,6 @@ import UIKit
         
         let digitBox = DigitBox()
         digitBox.isAccessibilityElement = true
-        digitBox.digitField.inputAccessoryView = MVMCoreUICommonViewsUtility.getToolbarWithDoneButton(delegate: self)
         digitBox.digitField.delegate = self
         digitBox.digitBoxDelegate = self
         return digitBox
@@ -335,6 +334,10 @@ import UIKit
         numberOfDigits = model.digits
         setAsSecureTextEntry(model.secureEntry)
         
+        for digitBox in digitBoxes {
+            digitBox.digitField.inputAccessoryView = MVMCoreUICommonViewsUtility.getToolbarWithDoneButton(delegate: delegateObject?.observingTextFieldDelegate ?? self)
+        }
+        
         super.set(with: model, delegateObject, additionalData)
     }
 }