diff --git a/build.gradle b/build.gradle
index c27b8572f..032430670 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ android {
     buildToolsVersion "23.0.2"
 
     defaultConfig {
-        versionCode 385
+        versionCode 386
         versionName "4.8.4"
         minSdkVersion 14
         targetSdkVersion 23
diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
index 1abe6121e..2aaf1cdc2 100644
--- a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
@@ -194,6 +194,7 @@ public class RepeatControlSet extends PopupControlSet {
             }
         }
         doRepeat = recurrence.length() > 0;
+        getDialogView();
         refreshDisplayView();
     }
 
@@ -277,7 +278,6 @@ public class RepeatControlSet extends PopupControlSet {
             public void onClick(View v) {
                 doRepeat = false;
                 refreshDisplayView();
-                dialog.dismiss();
 
                 for (RepeatChangedListener l : listeners) {
                     l.repeatChanged(doRepeat);