diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index b1e89681f5b07..e4ef09c4a211b 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -7862,6 +7862,7 @@ public class WindowManagerService extends IWindowManager.Stub
                             } catch (RemoteException e) {
                                 // Ignore if process has died.
                             }
+                            notifyFocusChanged();
                         }
 
                         if (lastFocus != null) {
@@ -7871,7 +7872,6 @@ public class WindowManagerService extends IWindowManager.Stub
                             } catch (RemoteException e) {
                                 // Ignore if process has died.
                             }
-                            notifyFocusChanged();
                         }
                     }
                 } break;