diff --git a/quickstep/src/com/android/quickstep/views/DesktopTaskView.java b/quickstep/src/com/android/quickstep/views/DesktopTaskView.java
index 9874f96..8385afe 100644
--- a/quickstep/src/com/android/quickstep/views/DesktopTaskView.java
+++ b/quickstep/src/com/android/quickstep/views/DesktopTaskView.java
@@ -284,11 +284,18 @@
         return false;
     }
 
+    @Override
+    public RunnableList launchTasks() {
+        showDesktopApps();
+        getRecentsView().onTaskLaunchedInLiveTileMode();
+        return new RunnableList();
+    }
+
     @Nullable
     @Override
     public RunnableList launchTaskAnimated() {
         RunnableList endCallback = new RunnableList();
-        SystemUiProxy.INSTANCE.get(getContext()).showDesktopApps();
+        showDesktopApps();
         RecentsView<?, ?> recentsView = getRecentsView();
         recentsView.addSideTaskLaunchCallback(endCallback);
         return endCallback;
@@ -296,10 +303,14 @@
 
     @Override
     public void launchTask(@NonNull Consumer<Boolean> callback, boolean freezeTaskList) {
-        SystemUiProxy.INSTANCE.get(getContext()).showDesktopApps();
+        showDesktopApps();
         callback.accept(true);
     }
 
+    private void showDesktopApps() {
+        SystemUiProxy.INSTANCE.get(getContext()).showDesktopApps();
+    }
+
     @Override
     void refreshThumbnails(@Nullable HashMap<Integer, ThumbnailData> thumbnailDatas) {
         // Sets new thumbnails based on the incoming data and refreshes the rest.
