diff --git a/CUIFlavoredPortfolioSite/App.razor.cs b/CUIFlavoredPortfolioSite/App.razor.cs
index ee7fa27..12a85e9 100644
--- a/CUIFlavoredPortfolioSite/App.razor.cs
+++ b/CUIFlavoredPortfolioSite/App.razor.cs
@@ -7,7 +7,7 @@
 
 namespace CUIFlavoredPortfolioSite;
 
-public partial class App : IDisposable
+public partial class App : IAsyncDisposable
 {
     public enum RuntimeModes
     {
@@ -178,8 +178,9 @@ private async ValueTask ProcessCommandLineAsync(string commandLineInputText, boo
         }
     }
 
-    public void Dispose()
+    public async ValueTask DisposeAsync()
     {
-        this._HotKeysContext?.Dispose();
+        GC.SuppressFinalize(this);
+        if (this._HotKeysContext is not null) await this._HotKeysContext.DisposeAsync();
     }
 }