diff --git a/Qwilight/View/SiteView.xaml b/Qwilight/View/SiteView.xaml
index d39fa9a..9712e83 100644
--- a/Qwilight/View/SiteView.xaml
+++ b/Qwilight/View/SiteView.xaml
@@ -235,7 +235,7 @@
                                     </DataTemplate>
                                 </ComboBox.ItemTemplate>
                             </ComboBox>
-                            <ComboBox Grid.Column="1" Style="{StaticResource StandardItemsInput}" ItemsSource="{Binding AvatarGroupCollection}" SelectedItem="{Binding AvatarGroupValue}" IsEnabled="{Binding IsIdle}" SelectionChanged="OnAvatarGroup">
+                            <ComboBox Grid.Column="1" Style="{StaticResource StandardItemsInput}" ItemsSource="{Binding AvatarGroupCollection}" SelectedItem="{Binding AvatarGroupValue}" IsEnabled="{Binding IsIdle}">
                                 <ComboBox.ItemTemplate>
                                     <DataTemplate>
                                         <TextBlock Style="{StaticResource StandardTextView}" Text="{Binding}" Foreground="{Binding Paint}" HorizontalAlignment="Left" />
diff --git a/Qwilight/View/SiteView.xaml.cs b/Qwilight/View/SiteView.xaml.cs
index 1304624..659e893 100644
--- a/Qwilight/View/SiteView.xaml.cs
+++ b/Qwilight/View/SiteView.xaml.cs
@@ -30,8 +30,6 @@
 
         void OnInputPostableItem(object sender, RoutedEventArgs e) => (DataContext as SiteViewModel).OnInputPostableItem();
 
-        void OnAvatarGroup(object sender, SelectionChangedEventArgs e) => (DataContext as SiteViewModel).OnAvatarGroup();
-
         void OnSetPostableItemBand(object sender, RoutedEventArgs e) => (DataContext as SiteViewModel).OnSetPostableItemBand();
     }
 }
\ No newline at end of file
diff --git a/Qwilight/ViewModel/SiteViewModel.cs b/Qwilight/ViewModel/SiteViewModel.cs
index 863c33a..577a561 100644
--- a/Qwilight/ViewModel/SiteViewModel.cs
+++ b/Qwilight/ViewModel/SiteViewModel.cs
@@ -267,15 +267,6 @@
             });
         }
 
-        public void OnAvatarGroup()
-        {
-            TwilightSystem.Instance.SendParallel(Event.Types.EventID.SetAvatarGroup, new
-            {
-                siteID = SiteID,
-                avatarGroup = AvatarGroupValue.Data
-            });
-        }
-
         public void OnSetPostableItemBand()
         {
             TwilightSystem.Instance.SendParallel(Event.Types.EventID.SetPostableItemBand, new
@@ -496,7 +487,17 @@
         {
             get => _avatarGroup;
 
-            set => SetProperty(ref _avatarGroup, value, nameof(AvatarGroupValue));
+            set
+            {
+                if (SetProperty(ref _avatarGroup, value, nameof(AvatarGroupValue)))
+                {
+                    TwilightSystem.Instance.SendParallel(Event.Types.EventID.SetAvatarGroup, new
+                    {
+                        siteID = SiteID,
+                        avatarGroup = value.Data
+                    });
+                }
+            }
         }
 
         public bool IsPostableItemMode