diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 8924d11..8b89e5d 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -323,6 +323,9 @@
 
     @Override
     public void onPause() {
+        if (mCameraSwitchAnimator != null && mCameraSwitchAnimator.isRunning()) {
+            mCameraSwitchAnimator.cancel();
+        }
         mPaused = true;
         mOrientationListener.disable();
         mCurrentModule.onPauseBeforeSuper();