diff --git a/waypoint_manager/scripts/manager_GUI.py b/waypoint_manager/scripts/manager_GUI.py
index 4817d8a..24696f8 100755
--- a/waypoint_manager/scripts/manager_GUI.py
+++ b/waypoint_manager/scripts/manager_GUI.py
@@ -678,10 +678,10 @@
             if (str(point[key]) == val): continue
             self.update_title()
             self.message("Apply changes of waypoint parameters")
+            self.waypoints.set_waypoint_val(self.editing_waypoint_id, key, val)
             if ((key == "x") or (key == "y")):
                 self.plot_waypoints(self.editing_waypoint_id)
                 self.draw_trajectory()
-            self.waypoints.set_waypoint_val(self.editing_waypoint_id, key, val)
         return
 
 
diff --git a/waypoint_manager/waypoint-manager-for-windows10.zip b/waypoint_manager/waypoint-manager-for-windows10.zip
index 9d48340..48cd956 100644
--- a/waypoint_manager/waypoint-manager-for-windows10.zip
+++ b/waypoint_manager/waypoint-manager-for-windows10.zip
Binary files differ