diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java
index bbdcfb7f..7b17b4f8 100644
--- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java
@@ -226,10 +226,11 @@ public class GuiKeyframeRepository extends GuiScreen implements GuiReplayOverlay
             saveOnQuit();
             super.keyTyped(typedChar, keyCode);
         }
-        if(currentKeyframeSet != null) {
-            currentKeyframeSet.setName(nameInput.getText());
-            keyframeSetList.replaceElement(keyframeSetList.getSelectionIndex(), currentKeyframeSet);
+        if(currentKeyframeSet != null && !currentKeyframeSet.getName().equals(nameInput.getText().trim())) {
+            currentKeyframeSet.setName(nameInput.getText().trim());
         }
+
+        super.keyTyped(typedChar, keyCode);
     }
 
     private void saveOnQuit() {