diff --git a/src/kekengine/cpp/ui/uielements.cpp b/src/kekengine/cpp/ui/uielements.cpp
index b36551f..c724cd0 100644
--- a/src/kekengine/cpp/ui/uielements.cpp
+++ b/src/kekengine/cpp/ui/uielements.cpp
@@ -263,6 +263,7 @@ UIElementType TextFieldElement::getType() {
 
 void TextFieldElement::focusEnter() {
 	cursor->visible = true;
+	lastCharTyped = glfwGetTime();
 
 	capture = Input::captureKeyboardInput(
 		KeyCharCallback([](KeyCharEvent event, void *data) {
@@ -337,8 +338,8 @@ void TextFieldElement::draw(UIPoint screenPos, glm::mat4 projection) {
 }
 
 void TextFieldElement::setText(std::string text) {
-	this->text = text;
-	this->textElement->setText(text);
+	this->cursorPos = 0;
+	updateText(Unicode::convertStdToU32(text));
 }
 
 }