diff --git a/java/com/android/newbubble/BottomActionViewController.java b/java/com/android/newbubble/BottomActionViewController.java
index 485d041..04e0e5f 100644
--- a/java/com/android/newbubble/BottomActionViewController.java
+++ b/java/com/android/newbubble/BottomActionViewController.java
@@ -40,8 +40,8 @@
   private final Context context;
   private final WindowManager windowManager;
   private final int gradientHeight;
-  private final int bottomActionViewTop;
   private final int textOffsetSize;
+  private int bottomActionViewTop;
 
   private View bottomActionView;
   private View dismissView;
@@ -55,7 +55,6 @@
     windowManager = context.getSystemService(WindowManager.class);
     gradientHeight =
         context.getResources().getDimensionPixelSize(R.dimen.bubble_bottom_action_view_height);
-    bottomActionViewTop = context.getResources().getDisplayMetrics().heightPixels - gradientHeight;
     textOffsetSize =
         context.getResources().getDimensionPixelSize(R.dimen.bubble_bottom_action_text_offset);
   }
@@ -76,6 +75,7 @@
 
     // Add the target to the window
     // TODO(yueg): use TYPE_NAVIGATION_BAR_PANEL to draw over navigation bar
+    bottomActionViewTop = context.getResources().getDisplayMetrics().heightPixels - gradientHeight;
     LayoutParams layoutParams =
         new LayoutParams(
             LayoutParams.MATCH_PARENT,
diff --git a/java/com/android/newbubble/NewMoveHandler.java b/java/com/android/newbubble/NewMoveHandler.java
index c00c107..12e099c 100644
--- a/java/com/android/newbubble/NewMoveHandler.java
+++ b/java/com/android/newbubble/NewMoveHandler.java
@@ -251,6 +251,14 @@
           }
         }
         break;
+      case MotionEvent.ACTION_CANCEL:
+        if (isMoving) {
+          snapX();
+          isMoving = false;
+          bubble.onMoveFinish();
+          bottomActionViewController.destroyBottomActionView();
+        }
+        break;
       default: // fall out
     }
     return true;
