diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 652977686..abc8d7205 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -598,10 +598,8 @@
                                         <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource startFlowLauncherOnSystemStartup}" />
                                     </StackPanel>
                                     <CheckBox
-                                        Checked="OnAutoStartupChecked"
                                         IsChecked="{Binding Settings.StartFlowLauncherOnSystemStartup}"
-                                        Style="{DynamicResource SideControlCheckBox}"
-                                        Unchecked="OnAutoStartupUncheck" />
+                                        Style="{DynamicResource SideControlCheckBox}"/>
                                     <TextBlock Style="{StaticResource Glyph}">
                                         &#xe8fc;
                                     </TextBlock>
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index d5259d497..c7b4baf2e 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -57,16 +57,6 @@ namespace Flow.Launcher
             hwndTarget.RenderMode = RenderMode.SoftwareOnly;
         }
 
-        private void OnAutoStartupChecked(object sender, RoutedEventArgs e)
-        {
-            viewModel.SetStartup();
-        }
-
-        private void OnAutoStartupUncheck(object sender, RoutedEventArgs e)
-        {
-            viewModel.RemoveStartup();
-        }
-
         private void OnSelectPythonDirectoryClick(object sender, RoutedEventArgs e)
         {
             var dlg = new FolderBrowserDialog
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 587349045..189a7bdc8 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -60,7 +60,13 @@ namespace Flow.Launcher.ViewModel
                 Settings.AutoUpdates = value;
 
                 if (value)
+                {
                     UpdateApp();
+                    SetStartup();
+                } else 
+                {
+                    RemoveStartup();
+                }
             }
         }