diff --git a/public/js/app.js b/public/js/app.js
index 4b67c3f32..cd85df6ac 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -187,41 +187,10 @@ $(document).ready(function () {
         }
     });
 
-    if ($('.input-group-recurring #recurring_frequency').length == 0) {
+    if (document.getElementById('recurring_frequency')) {
         $(".input-group-recurring #recurring_frequency").select2();
         $('.input-group-recurring #recurring_frequency').trigger('change');
     }
-
-    $(document).on('change', '.input-group-recurring #recurring_frequency', function (e) {
-        var value = $(this).val();
-
-        var recurring_frequency = $('#recurring_frequency').parent().parent();
-        var recurring_interval = $('#recurring_interval').parent();
-        var recurring_custom_frequency = $('#recurring_custom_frequency').parent();
-        var recurring_count = $('#recurring_count').parent();
-
-        if (value == 'custom') {
-            recurring_frequency.removeClass('col-md-12').removeClass('col-md-12').addClass('col-md-4');
-
-            recurring_interval.removeClass('hidden');
-            recurring_custom_frequency.removeClass('hidden');
-            recurring_count.removeClass('hidden');
-
-            $("#recurring_custom_frequency").select2();
-        } else if (value == 'no' || value == '') {
-            recurring_frequency.removeClass('col-md-10').removeClass('col-md-4').addClass('col-md-12');
-
-            recurring_interval.addClass('hidden');
-            recurring_custom_frequency.addClass('hidden');
-            recurring_count.addClass('hidden');
-        } else {
-            recurring_frequency.removeClass('col-md-12').removeClass('col-md-4').addClass('col-md-10');
-
-            recurring_interval.addClass('hidden');
-            recurring_custom_frequency.addClass('hidden');
-            recurring_count.removeClass('hidden');
-        }
-    });
 });
 
 function confirmDelete(form_id, title, message, button_cancel, button_delete) {
@@ -285,3 +254,34 @@ $(document).on('click', '.popup', function(e) {
         }
     });
 });
+
+$(document).on('change', '.input-group-recurring #recurring_frequency', function (e) {
+    var value = $(this).val();
+
+    var recurring_frequency = $('#recurring_frequency').parent().parent();
+    var recurring_interval = $('#recurring_interval').parent();
+    var recurring_custom_frequency = $('#recurring_custom_frequency').parent();
+    var recurring_count = $('#recurring_count').parent();
+
+    if (value == 'custom') {
+        recurring_frequency.removeClass('col-md-12').removeClass('col-md-12').addClass('col-md-4');
+
+        recurring_interval.removeClass('hidden');
+        recurring_custom_frequency.removeClass('hidden');
+        recurring_count.removeClass('hidden');
+
+        $("#recurring_custom_frequency").select2();
+    } else if (value == 'no' || value == '') {
+        recurring_frequency.removeClass('col-md-10').removeClass('col-md-4').addClass('col-md-12');
+
+        recurring_interval.addClass('hidden');
+        recurring_custom_frequency.addClass('hidden');
+        recurring_count.addClass('hidden');
+    } else {
+        recurring_frequency.removeClass('col-md-12').removeClass('col-md-4').addClass('col-md-10');
+
+        recurring_interval.addClass('hidden');
+        recurring_custom_frequency.addClass('hidden');
+        recurring_count.removeClass('hidden');
+    }
+});