diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FloatingRotationButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FloatingRotationButton.java
index 6286d4d7febf6..a79b6251a3d03 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FloatingRotationButton.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FloatingRotationButton.java
@@ -136,7 +136,10 @@ public class FloatingRotationButton implements RotationButton {
 
     @Override
     public void setOnClickListener(View.OnClickListener onClickListener) {
-        mKeyButtonView.setOnClickListener(onClickListener);
+        mKeyButtonView.setOnClickListener(view -> {
+            hide();
+            onClickListener.onClick(view);
+        });
     }
 
     @Override