diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
index ca2100a..9393c21 100644
--- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java
@@ -595,17 +595,19 @@
         private static final String TAG = "ClearTaskSystemShortcut";
 
         private final TaskView mTaskView;
+        private final TaskContainer mTaskContainer;
 
         public ClearTaskSystemShortcut(ActivityContext target, TaskContainer taskContainer) {
             super(R.drawable.ic_close, R.string.recents_clear, target, taskContainer.getItemInfo(),
                     taskContainer.getTaskView());
             mTaskView = taskContainer.getTaskView();
+            mTaskContainer = taskContainer;
         }
 
         @Override
         public void onClick(View view) {
             dismissTaskMenuView();
-            mTaskView.getRecentsView().dismissTask(mTaskView, true /*animateTaskView*/,
+            mTaskView.getRecentsView().dismissTask(mTaskContainer.getTask().key.id, true /*animateTaskView*/,
                     true /*removeTask*/);
         }
     }
