diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt
index 70ed5155f..92e90b976 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt
@@ -839,36 +839,41 @@ class SettingsActivity : SimpleActivity() {
     }
 
     private fun setupEnableAutomaticBackups() {
+        settings_backups_label.beVisibleIf(isRPlus())
+        settings_backups_divider.beVisibleIf(isRPlus())
+        settings_enable_automatic_backups_holder.beVisibleIf(isRPlus())
         settings_enable_automatic_backups.isChecked = config.autoBackup
         settings_enable_automatic_backups_holder.setOnClickListener {
-            settings_enable_automatic_backups.toggle()
-            if (!config.autoBackup) {
+            val wasBackupDisabled = !config.autoBackup
+            if (wasBackupDisabled) {
                 ManageAutomaticBackupsDialog(
                     activity = this,
-                    onSuccess = {
-                        scheduleNextAutomaticBackup()
-                    },
-                    onCancel = {
-                        config.autoBackup = false
-                        settings_enable_automatic_backups.isChecked = false
-                        settings_manage_automatic_backups_holder.beGone()
-                    }
+                    onSuccess = { scheduleNextAutomaticBackup() },
+                    onCancel = { enableOrDisableAutomaticBackups(false) }
                 )
+                enableOrDisableAutomaticBackups(true)
             } else {
                 cancelScheduledAutomaticBackup()
+                enableOrDisableAutomaticBackups(false)
             }
-            config.autoBackup = settings_enable_automatic_backups.isChecked
-            settings_manage_automatic_backups_holder.beVisibleIf(config.autoBackup)
         }
     }
 
     private fun setupManageAutomaticBackups() {
-        settings_manage_automatic_backups_holder.beVisibleIf(config.autoBackup)
+        settings_manage_automatic_backups_holder.beVisibleIf(isRPlus() && config.autoBackup)
         settings_manage_automatic_backups_holder.setOnClickListener {
-            ManageAutomaticBackupsDialog(this)
+            ManageAutomaticBackupsDialog(this, onSuccess = {
+                scheduleNextAutomaticBackup()
+            })
         }
     }
 
+    private fun enableOrDisableAutomaticBackups(enable: Boolean) {
+        config.autoBackup = enable
+        settings_enable_automatic_backups.isChecked = enable
+        settings_manage_automatic_backups_holder.beVisibleIf(enable)
+    }
+
     private fun setupExportSettings() {
         settings_export_holder.setOnClickListener {
             val configItems = LinkedHashMap<String, Any>().apply {
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt
index e03dc6fae..7c3ecf4b2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt
@@ -257,8 +257,8 @@ fun Context.backupEventsAndTasks() {
                 }
             )
             config.lastAutoBackupTime = getNowSeconds()
-            scheduleNextAutomaticBackup()
         }
+        scheduleNextAutomaticBackup()
     }
 }