diff --git a/InfernalRobotics/InfernalRobotics/Gui/ControlsGUI.cs b/InfernalRobotics/InfernalRobotics/Gui/ControlsGUI.cs
index cac2318c..2dfb3bc6 100644
--- a/InfernalRobotics/InfernalRobotics/Gui/ControlsGUI.cs
+++ b/InfernalRobotics/InfernalRobotics/Gui/ControlsGUI.cs
@@ -1122,7 +1122,8 @@ private void PresetsEditWindow(int windowID)
                     && focusedControlName == lastFocusedControlName)
                     lastFocusedTextFieldValue = tmp;
                 
-                var valueChanged = Event.current.keyCode == KeyCode.Return || Event.current.keyCode == KeyCode.KeypadEnter;
+                var valueChanged = (thisControlName == focusedControlName && 
+                                   (Event.current.keyCode == KeyCode.Return || Event.current.keyCode == KeyCode.KeypadEnter));
 
                 float tmpValue;