diff --git a/MainWindow.xaml b/MainWindow.xaml
index d831c6e..963b943 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -143,7 +143,7 @@
 
                         <TextBlock Text="Selected Item Display" Grid.Row="5" VerticalAlignment="Center" Margin="0,0,8,8"/>
                         <ComboBox x:Name="ItemDisplayModeBox" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2"
-                                  Margin="0,0,0,8" SelectionChanged="PreviewField_Changed"/>
+                                  Margin="0,0,0,8" SelectionChanged="ItemDisplayModeBox_SelectionChanged"/>
 
                         <TextBlock Text="Preview" Grid.Row="6" VerticalAlignment="Top" Margin="0,4,8,0"/>
                         <Border Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2"
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 94dcf98..8cdeff6 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -114,6 +114,11 @@ public partial class MainWindow : Window
 
     private void ItemsTree_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
     {
+        if (!isLoadingSelection && selectedItem is not null)
+        {
+            ApplyCurrentItem();
+        }
+
         if (e.NewValue is not TreeViewItem treeItem || treeItem.Tag is not LauncherItem item)
         {
             selectedItem = null;
@@ -946,6 +951,23 @@ public partial class MainWindow : Window
         }
     }
 
+    private void ItemDisplayModeBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (isLoadingSelection)
+        {
+            return;
+        }
+
+        if (selectedItem is not null && ItemDisplayModeBox.SelectedItem is LauncherDisplayMode itemMode)
+        {
+            selectedItem.DisplayMode = itemMode;
+            selectedPath = FindItemPath(selectedItem);
+            StatusText.Text = "Click Save to keep the selected item display mode.";
+        }
+
+        UpdatePreview();
+    }
+
     private void EnsureAutomaticIconPath()
     {
         if (TypeBox.SelectedItem is LauncherItemType.Menu)