diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java
index 01187ed94de5b..43605e30b8135 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java
@@ -190,6 +190,10 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
         }
         mWindowDecorViewHolder.bindData(mTaskInfo);
 
+        if (!mTaskInfo.isFocused) {
+            closeHandleMenu();
+        }
+
         if (!isDragResizeable) {
             closeDragResizeListener();
             return;