diff --git a/WeeXnes/Core/Global.cs b/WeeXnes/Core/Global.cs
index 273648c..7cc9124 100644
--- a/WeeXnes/Core/Global.cs
+++ b/WeeXnes/Core/Global.cs
@@ -18,6 +18,7 @@ namespace WeeXnes.Core
         public static string AppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "WeeXnes");
         public static UpdateVar<string> AppDataPathRPC = new UpdateVar<string>();
         public static UpdateVar<string> AppDataPathKEY = new UpdateVar<string>();
+        public static UpdateVar<bool> checkUpdateOnStartup = new UpdateVar<bool>();
         public static string SettingsFile = "settings.ini";
         public class Defaults
         {
diff --git a/WeeXnes/Core/SaveSettingsHandler.cs b/WeeXnes/Core/SaveSettingsHandler.cs
index e97ed47..e9f4669 100644
--- a/WeeXnes/Core/SaveSettingsHandler.cs
+++ b/WeeXnes/Core/SaveSettingsHandler.cs
@@ -18,6 +18,7 @@ namespace WeeXnes.Core
                 public const string Section = "GENERAL";
                 public const string RpcFilesPath = "RpcFilesPath";
                 public const string KeyFilesPath = "KeyFilesPath";
+                public const string StartupUpdateCheck = "StartupUpdateCheck";
             }
             public static class KeyManager
             {
@@ -87,6 +88,14 @@ namespace WeeXnes.Core
                     Global.AppDataPathKEY.Value
                 );
             };
+            Global.checkUpdateOnStartup.ValueChanged += () =>
+            {
+                SettingsView.Data.settingsFile.SetValue(
+                    Data.General.Section,
+                    Data.General.StartupUpdateCheck,
+                    Global.checkUpdateOnStartup.Value.ToString()
+                );
+            };
         }
     }
 }
\ No newline at end of file
diff --git a/WeeXnes/Views/Settings/SettingsView.xaml b/WeeXnes/Views/Settings/SettingsView.xaml
index b1f8271..57b226e 100644
--- a/WeeXnes/Views/Settings/SettingsView.xaml
+++ b/WeeXnes/Views/Settings/SettingsView.xaml
@@ -114,6 +114,11 @@
                 
                 <StackPanel Orientation="Vertical" Visibility="Collapsed" Name="DebugOptions">
                     <Label Content="Debug" HorizontalAlignment="Center"/>
+                    
+                    <CheckBox Content="Check for updates on Startup"
+                              Name="CheckboxAutoUpdate"
+                              Checked="CheckboxAutoUpdate_OnChecked"
+                              Unchecked="CheckboxAutoUpdate_OnUnchecked"/>
                     <ui:CardAction Icon="ErrorCircle24"
                                    Click="dbg_throwException">
                         <StackPanel>
diff --git a/WeeXnes/Views/Settings/SettingsView.xaml.cs b/WeeXnes/Views/Settings/SettingsView.xaml.cs
index a1c5bdf..151b9e2 100644
--- a/WeeXnes/Views/Settings/SettingsView.xaml.cs
+++ b/WeeXnes/Views/Settings/SettingsView.xaml.cs
@@ -50,7 +50,18 @@ namespace WeeXnes.Views.Settings
         {
             KeyManagerView.Data.censorKeys.Value = false;
         }
+        
+        private void CheckboxAutoUpdate_OnChecked(object sender, RoutedEventArgs e)
+        {
+            Global.checkUpdateOnStartup.Value = true;
+        }
+        private void CheckboxAutoUpdate_OnUnchecked(object sender, RoutedEventArgs e)
+        {
+            Global.checkUpdateOnStartup.Value = false;
+        }
 
+        
+        
 
 
         private void ButtonCheckForUpdates_OnClick(object sender, RoutedEventArgs e)