diff --git a/OTPFieldView.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate b/OTPFieldView.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..6260cc7
Binary files /dev/null and b/OTPFieldView.xcodeproj/project.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/OTPFieldView.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist b/OTPFieldView.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..261e774
--- /dev/null
+++ b/OTPFieldView.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>OTPFieldView.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/OTPFieldView/OTPFieldView.swift b/OTPFieldView/OTPFieldView.swift
index bcee25d..d97de03 100644
--- a/OTPFieldView/OTPFieldView.swift
+++ b/OTPFieldView/OTPFieldView.swift
@@ -250,6 +250,9 @@ extension OTPFieldView: UITextFieldDelegate {
     public func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool {
         let shouldBeginEditing = delegate?.shouldBecomeFirstResponderForOTP(otpTextFieldIndex: (textField.tag - 1)) ?? true
         if shouldBeginEditing {
+            DispatchQueue.main.async {
+                textField.selectedTextRange = textField.textRange(from: textField.endOfDocument, to: textField.endOfDocument)
+            }
             return isPreviousFieldsEntered(forTextField: textField)
         }