diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
index 4c11ba39a..a840d5a97 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
@@ -151,6 +151,10 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
         mRepeatInterval = interval
         updateRepetitionText()
         checkRepeatTexts(interval)
+
+        if (mRepeatInterval == DAY) {
+            setRepeatRule(EVERY_DAY)
+        }
     }
 
     private fun checkRepeatTexts(limit: Int) {
@@ -190,18 +194,22 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
     private fun showRepetitionRuleDialog() {
         if (mRepeatInterval == DAY) {
             RepeatRuleDailyDialog(this, mRepeatRule) {
-                mRepeatRule = it
-                checkRepetitionRuleText()
-                if (it == 0) {
-                    setRepeatInterval(0)
-                }
+                setRepeatRule(it)
             }
         }
     }
 
+    private fun setRepeatRule(rule: Int) {
+        mRepeatRule = rule
+        checkRepetitionRuleText()
+        if (rule == 0) {
+            setRepeatInterval(0)
+        }
+    }
+
     private fun checkRepetitionRuleText() {
         if (mRepeatInterval == DAY) {
-            event_repetition_rule.text = getString(if (mRepeatRule == 127) R.string.every_day else R.string.selected_days)
+            event_repetition_rule.text = getString(if (mRepeatRule == EVERY_DAY) R.string.every_day else R.string.selected_days)
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
index 64e65b914..415f9dfd2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
@@ -54,7 +54,7 @@ val THURSDAY = 8
 val FRIDAY = 16
 val SATURDAY = 32
 val SUNDAY = 64
-val ALL_DAYS = 127
+val EVERY_DAY = 127
 
 // repeat_rule for monthly repetition
 val REPEAT_MONTH_SAME_DAY = 1
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt
index 0d3814104..c2bac1fa3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt
@@ -593,7 +593,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
                 do {
                     val eventId = cursor.getIntValue(COL_EVENT_ID)
                     val interval = cursor.getIntValue(COL_REPEAT_INTERVAL)
-                    var rule = ALL_DAYS
+                    var rule = EVERY_DAY
                     if (interval == MONTH) {
                         rule = REPEAT_MONTH_SAME_DAY
                     }