diff --git a/klippy/extras/force_move.py b/klippy/extras/force_move.py
index 928850c0a4f6..5c27e6f4d0d2 100644
--- a/klippy/extras/force_move.py
+++ b/klippy/extras/force_move.py
@@ -94,10 +94,10 @@ def manual_move(self, stepper, dist, speed, accel=0.):
         print_time = print_time + accel_t + cruise_t + accel_t
         stepper.generate_steps(print_time)
         self.trapq_finalize_moves(self.trapq, print_time + 99999.9)
-        stepper.set_trapq(prev_trapq)
-        stepper.set_stepper_kinematics(prev_sk)
         toolhead.note_kinematic_activity(print_time)
         toolhead.dwell(accel_t + cruise_t + accel_t)
+        stepper.set_trapq(prev_trapq)
+        stepper.set_stepper_kinematics(prev_sk)
     def _lookup_stepper(self, gcmd):
         name = gcmd.get('STEPPER')
         if name not in self.steppers: