diff --git a/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs b/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
index 55f62b753..2c63f6af0 100644
--- a/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
+++ b/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
@@ -279,10 +279,10 @@ namespace Ryujinx.Ava.UI.Applet
                     .ForEach(profile => profiles.Add(new Models.UserProfile(profile, nav)));
                 
                 profiles.Add(new Models.UserProfile(guest, nav));
-                UserSelectorDialogViewModel ViewModel = new();
-                ViewModel.Profiles = profiles;
-                ViewModel.SelectedUserId = _parent.AccountManager.LastOpenedUser.UserId;
-                UserSelectorDialog content = new(ViewModel);
+                UserSelectorDialogViewModel viewModel = new();
+                viewModel.Profiles = profiles;
+                viewModel.SelectedUserId = _parent.AccountManager.LastOpenedUser.UserId;
+                UserSelectorDialog content = new(viewModel);
                 (UserId id, _) = await UserSelectorDialog.ShowInputDialog(content);
                 
                 selected = id;
diff --git a/src/Ryujinx/UI/ViewModels/UserSelectorDialogViewModel.cs b/src/Ryujinx/UI/ViewModels/UserSelectorDialogViewModel.cs
index 29d2663c8..094aed5cf 100644
--- a/src/Ryujinx/UI/ViewModels/UserSelectorDialogViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/UserSelectorDialogViewModel.cs
@@ -6,38 +6,9 @@ namespace Ryujinx.Ava.UI.ViewModels
 {
     public partial class UserSelectorDialogViewModel : BaseModel
     {
-        private UserId _selectedUserId;
-        private ObservableCollection<BaseModel> _profiles;
 
-        public UserId SelectedUserId
-        {
-            get => _selectedUserId;
-            set
-            {
-                if (_selectedUserId != value)
-                {
-                    _selectedUserId = value;
-                    OnPropertyChanged();
-                }
-            }
-        }
+        [ObservableProperty] private UserId _selectedUserId;
 
-        public ObservableCollection<BaseModel> Profiles
-        {
-            get => _profiles;
-            set
-            {
-                if (_profiles != value)
-                {
-                    _profiles = value;
-                    OnPropertyChanged();
-                }
-            }
-        }
-
-        public UserSelectorDialogViewModel()
-        {
-            Profiles = new ObservableCollection<BaseModel>();
-        }
+        [ObservableProperty] private ObservableCollection<BaseModel> _profiles = [];
     }
 }