diff --git a/src/modules/awake/Awake/Core/APIHelper.cs b/src/modules/awake/Awake/Core/APIHelper.cs
index ffa242a86..da128f639 100644
--- a/src/modules/awake/Awake/Core/APIHelper.cs
+++ b/src/modules/awake/Awake/Core/APIHelper.cs
@@ -184,13 +184,10 @@ namespace Awake.Core
                 if (success)
                 {
                     _log.Info($"Initiated indefinite keep awake in background thread: {GetCurrentThreadId()}. Screen on: {keepDisplayOn}");
-                    while (true)
-                    {
-                        if (_threadToken.IsCancellationRequested)
-                        {
-                            _threadToken.ThrowIfCancellationRequested();
-                        }
-                    }
+
+                    WaitHandle.WaitAny(new[] { _threadToken.WaitHandle });
+
+                    return success;
                 }
                 else
                 {
diff --git a/src/modules/awake/Awake/Program.cs b/src/modules/awake/Awake/Program.cs
index 9087ad848..1cb660356 100644
--- a/src/modules/awake/Awake/Program.cs
+++ b/src/modules/awake/Awake/Program.cs
@@ -28,6 +28,7 @@ namespace Awake
     {
         private static Mutex? _mutex = null;
         private const string AppName = "Awake";
+        private const string FullAppName = "PowerToys " + AppName;
         private static FileSystemWatcher? _watcher = null;
         private static SettingsUtils? _settingsUtils = null;
 
@@ -127,7 +128,6 @@ namespace Awake
         private static void ForceExit(string message, int exitCode)
         {
             _log.Info(message);
-            Console.ReadKey();
             Environment.Exit(exitCode);
         }
 
@@ -180,7 +180,7 @@ namespace Awake
                         .Select(e => e.EventArgs)
                         .Subscribe(HandleAwakeConfigChange);
 
-                    TrayHelper.SetTray(AppName, new AwakeSettings());
+                    TrayHelper.SetTray(FullAppName, new AwakeSettings());
 
                     // Initially the file might not be updated, so we need to start processing
                     // settings right away.