diff --git a/source/enter_name.cpp b/source/enter_name.cpp
index fd9324f..86d595a 100644
--- a/source/enter_name.cpp
+++ b/source/enter_name.cpp
@@ -39,9 +39,9 @@ void EnterName::addCharacter() {
     }
 
     // Si el nombre está completo, cambia el caracter seleccionado a el caracter de finalizar
-   /*if (nameIsFull()) {
+    if (nameIsFull()) {
         forceEndCharSelected();
-    }*/
+    }
 }
 
 // Elimina el último carácter del nombre
diff --git a/source/player.cpp b/source/player.cpp
index 7e0027e..bc3e28f 100644
--- a/source/player.cpp
+++ b/source/player.cpp
@@ -148,12 +148,16 @@ void Player::setInputEnteringName(Input::Action action) {
             }
             break;
         case Input::Action::RIGHT:
-            enter_name_->incIndex();
-            playSound("service_menu_move.wav");
+            if (!enter_name_->nameIsFull()) {
+                enter_name_->incIndex();
+                playSound("service_menu_move.wav");
+            }
             break;
         case Input::Action::LEFT:
-            enter_name_->decIndex();
-            playSound("service_menu_move.wav");
+            if (!enter_name_->nameIsFull()) {
+                enter_name_->decIndex();
+                playSound("service_menu_move.wav");
+            }
             break;
         case Input::Action::START:
             if (isShowingName()) {