diff --git a/src/chassis_gimbal_shooter_manual.cpp b/src/chassis_gimbal_shooter_manual.cpp
index 183c8eea..ca591080 100644
--- a/src/chassis_gimbal_shooter_manual.cpp
+++ b/src/chassis_gimbal_shooter_manual.cpp
@@ -567,10 +567,11 @@ void ChassisGimbalShooterManual::vPress()
 
 void ChassisGimbalShooterManual::shiftPress()
 {
-  if (chassis_cmd_sender_->getMsg()->mode != rm_msgs::ChassisCmd::FOLLOW)
+  if (chassis_cmd_sender_->getMsg()->mode != rm_msgs::ChassisCmd::FOLLOW || is_gyro_)
   {
     chassis_cmd_sender_->setMode(rm_msgs::ChassisCmd::FOLLOW);
-    vel_cmd_sender_->setAngularZVel(0.);
+    vel_cmd_sender_->setAngularZVel(1.0);
+    is_gyro_ = false;
   }
   chassis_cmd_sender_->power_limit_->updateState(rm_common::PowerLimit::BURST);
 }