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 7a8e73d78..21ef9d51e 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
@@ -847,13 +847,10 @@ class SettingsActivity : SimpleActivity() {
                 ManageAutomaticBackupsDialog(
                     activity = this,
                     onSuccess = {
+                        enableOrDisableAutomaticBackups(true)
                         scheduleNextAutomaticBackup()
-                    },
-                    onCancel = {
-                        enableOrDisableAutomaticBackups(false)
                     }
                 )
-                enableOrDisableAutomaticBackups(true)
             } else {
                 cancelScheduledAutomaticBackup()
                 enableOrDisableAutomaticBackups(false)
@@ -864,9 +861,12 @@ class SettingsActivity : SimpleActivity() {
     private fun setupManageAutomaticBackups() {
         settings_manage_automatic_backups_holder.beVisibleIf(isRPlus() && config.autoBackup)
         settings_manage_automatic_backups_holder.setOnClickListener {
-            ManageAutomaticBackupsDialog(this, onSuccess = {
-                scheduleNextAutomaticBackup()
-            })
+            ManageAutomaticBackupsDialog(
+                activity = this,
+                onSuccess = {
+                    scheduleNextAutomaticBackup()
+                }
+            )
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ManageAutomaticBackupsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ManageAutomaticBackupsDialog.kt
index 6642ffb17..184ba2cea 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ManageAutomaticBackupsDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ManageAutomaticBackupsDialog.kt
@@ -10,7 +10,7 @@ import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.ensureBackgroundThread
 import kotlinx.android.synthetic.main.dialog_manage_automatic_backups.view.*
 
-class ManageAutomaticBackupsDialog(private val activity: SimpleActivity, onSuccess: (() -> Unit)? = null, onCancel: (() -> Unit)? = null) {
+class ManageAutomaticBackupsDialog(private val activity: SimpleActivity, onSuccess: () -> Unit) {
     private val view = (activity.layoutInflater.inflate(R.layout.dialog_manage_automatic_backups, null) as ViewGroup)
     private val config = activity.config
     private var backupFolder = config.autoBackupFolder
@@ -100,18 +100,16 @@ class ManageAutomaticBackupsDialog(private val activity: SimpleActivity, onSucce
                                         }
                                     }
 
-                                    onSuccess?.invoke()
+                                    activity.runOnUiThread {
+                                        onSuccess()
+                                    }
+
                                     dialog.dismiss()
                                 }
                             }
                             else -> activity.toast(R.string.invalid_name)
                         }
                     }
-
-                    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener {
-                        onCancel?.invoke()
-                        dialog.dismiss()
-                    }
                 }
             }
     }