diff --git a/src/Ryujinx.HLE/HOS/Applets/WindowSystem.cs b/src/Ryujinx.HLE/HOS/Applets/WindowSystem.cs
index 95b9ecde8..88fade3b3 100644
--- a/src/Ryujinx.HLE/HOS/Applets/WindowSystem.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/WindowSystem.cs
@@ -592,7 +592,7 @@ namespace Ryujinx.HLE.HOS.Applets
             {
                 if (_applets.TryGetValue(pid, out applet))
                 {
-                    if (_applets.Count > 1)
+                    if (_applets.Count > 2)
                     {
                         return true;
                     }
diff --git a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ICommonStateGetter.cs b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ICommonStateGetter.cs
index e2d4ba628..737a522d6 100644
--- a/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ICommonStateGetter.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ICommonStateGetter.cs
@@ -135,6 +135,9 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
             Logger.Stub?.PrintStub(LogClass.ServiceAm);
 
             _acquiredSleepLockEvent.ReadableEvent.Signal();
+            
+            _applet.AppletState.SetFocusForce(true);
+            context.Device.System.WindowSystem.RequestApplicationToGetForeground(_applet.ProcessHandle.Pid);
 
             return ResultCode.Success;
         }