diff --git a/resources/qml/GeneralPage.qml b/resources/qml/GeneralPage.qml
index b2ff44b15a..3db56d4699 100644
--- a/resources/qml/GeneralPage.qml
+++ b/resources/qml/GeneralPage.qml
@@ -36,6 +36,11 @@ UM.PreferencesPage
         scaleToFitCheckbox.checked = boolCheck(UM.Preferences.getValue("mesh/scale_to_fit"))
         var defaultLanguage = UM.Preferences.getValue("general/language")
         setDefaultLanguage(defaultLanguage)
+
+        if (UM.Models.pluginsModel.find("id", "UpdateChecker") > -1) {
+            UM.Preferences.resetPreference("info/automatic_update_check")
+            checkUpdatesCheckbox.checked = boolCheck(UM.Preferences.getValue("info/automatic_update_check"))
+        }
     }
 
     ColumnLayout
@@ -150,6 +155,21 @@ UM.PreferencesPage
             }
         }
 
+        UM.TooltipArea {
+            visible: UM.Models.pluginsModel.find("id", "UpdateChecker") > -1
+            width: childrenRect.width
+            height: childrenRect.height
+            text: catalog.i18nc("@info:tooltip","Should Cura check for updates when the program is started?")
+
+            CheckBox
+            {
+                id: checkUpdatesCheckbox
+                text: catalog.i18nc("@option:check","Check for updates on start")
+                checked: boolCheck(UM.Preferences.getValue("info/automatic_update_check"))
+                onCheckedChanged: UM.Preferences.setValue("info/automatic_update_check", checked)
+            }
+        }
+
         UM.TooltipArea {
             width: childrenRect.width
             height: childrenRect.height