3 files changed, 3 insertions, 6 deletions
diff --git a/Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml.cs b/Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml.cs
index 8c28abff..788f47a1 100644
--- a/Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -36,10 +36,7 @@ namespace Ryujinx.Ava.UI.Views.Main
 
         private async void StopEmulation_Click(object sender, RoutedEventArgs e)
         {
-            await Task.Run(() =>
-            {
-                Window.ViewModel.AppHost?.ShowExitPrompt();
-            });
+            await Window.ViewModel.AppHost?.ShowExitPrompt();
         }
 
         private async void PauseEmulation_Click(object sender, RoutedEventArgs e)
diff --git a/Ryujinx.Ava/UI/Views/Main/MainStatusBarView.axaml.cs b/Ryujinx.Ava/UI/Views/Main/MainStatusBarView.axaml.cs
index d1050ddd..473de0ee 100644
--- a/Ryujinx.Ava/UI/Views/Main/MainStatusBarView.axaml.cs
+++ b/Ryujinx.Ava/UI/Views/Main/MainStatusBarView.axaml.cs
@@ -22,7 +22,7 @@ namespace Ryujinx.Ava.UI.Views.Main
         {
             base.OnAttachedToVisualTree(e);
 
-            if (this.VisualRoot is MainWindow window)
+            if (VisualRoot is MainWindow window)
             {
                 Window = window;
             }
diff --git a/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml.cs b/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml.cs
index 841d59de..fd757893 100644
--- a/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml.cs
+++ b/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml.cs
@@ -22,7 +22,7 @@ namespace Ryujinx.Ava.UI.Views.Main
         {
             base.OnAttachedToVisualTree(e);
 
-            if (this.VisualRoot is MainWindow window)
+            if (VisualRoot is MainWindow window)
             {
                 ViewModel = window.ViewModel;
             }