diff --git a/awx/ui/client/src/scheduler/schedulerAdd.controller.js b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
index a37362b6b4..26be29c03a 100644
--- a/awx/ui/client/src/scheduler/schedulerAdd.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
@@ -52,59 +52,13 @@ export default ['$compile', '$state', '$stateParams', 'AddSchedule', 'Wait', '$s
 
     var callSelect2 = function() {
         CreateSelect2({
-            element: '#schedulerTimeZone',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#schedulerFrequency',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#monthlyWeekDay',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#monthlyOccurrence',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#monthlyOccurrence',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#yearlyMonth',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#yearlyWeekDay',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#yearlyOccurrence',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#yearlyOtherMonth',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#schedulerEnd',
+            element: '.MakeSelect2',
             multiple: false
         });
     };
 
     $scope.$on("updateSchedulerSelects", function() {
         callSelect2();
-        console.log("select2 is called");
     });
 
     callSelect2();
diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index 96646bfff0..fb8d8052b5 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -56,59 +56,13 @@ export default ['$compile', '$state', '$stateParams', 'EditSchedule', 'Wait', '$
 
     var callSelect2 = function() {
         CreateSelect2({
-            element: '#schedulerTimeZone',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#schedulerFrequency',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#monthlyWeekDay',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#monthlyOccurrence',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#monthlyOccurrence',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#yearlyMonth',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#yearlyWeekDay',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#yearlyOccurrence',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#yearlyOtherMonth',
-            multiple: false
-        });
-
-        CreateSelect2({
-            element: '#schedulerEnd',
+            element: '.MakeSelect2',
             multiple: false
         });
     };
 
     $scope.$on("updateSchedulerSelects", function() {
         callSelect2();
-        console.log("select2 is called");
     });
 
     callSelect2();
diff --git a/awx/ui/client/src/scheduler/schedulerForm.partial.html b/awx/ui/client/src/scheduler/schedulerForm.partial.html
index 29ce37a2f5..b849c90e53 100644
--- a/awx/ui/client/src/scheduler/schedulerForm.partial.html
+++ b/awx/ui/client/src/scheduler/schedulerForm.partial.html
@@ -145,6 +145,7 @@
                             Local Time Zone
                         </label>
                         <select
+                            class="MakeSelect2"
                             name="schedulerTimeZone"
                             id="schedulerTimeZone"
                             ng-model="schedulerTimeZone"
@@ -160,6 +161,7 @@
                         </label>
                         <select name="schedulerFrequency"
                             id="schedulerFrequency"
+                            class="MakeSelect2"
                             ng-model="schedulerFrequency"
                             ng-options="f.name for f in frequencyOptions"
                             required class="form-control input-sm"
@@ -254,7 +256,8 @@
                                     ng-model="$parent.monthlyOccurrence"
                                     ng-options="o.name for o in occurrences"
                                     ng-disabled="monthlyRepeatOption != 'other'"
-                                    class="form-control input-sm
+                                    class=" MakeSelect2 form-control
+                                        input-sm
                                         RepeatFrequencyOptions-spacedSelect
                                         RepeatFrequencyOptions-monthlyOccurence"
                                 >
@@ -264,7 +267,7 @@
                                     ng-model="$parent.monthlyWeekDay"
                                     ng-options="w.name for w in weekdays"
                                     ng-disabled="monthlyRepeatOption != 'other'"
-                                    class="form-control input-sm" >
+                                    class="MakeSelect2 form-control input-sm" >
                                 </select>
                             </div>
                         </div>
@@ -291,7 +294,7 @@
                                     ng-model="$parent.yearlyMonth"
                                     ng-options="m.name for m in months"
                                     ng-disabled="yearlyRepeatOption != 'month'"
-                                    class="form-control input-sm
+                                    class="MakeSelect2 form-control input-sm
                                         RepeatFrequencyOptions-spacedSelect"
                                 >
                                 </select>
@@ -335,7 +338,8 @@
                                     ng-model="$parent.yearlyOccurrence"
                                     ng-options="o.name for o in occurrences"
                                     ng-disabled="yearlyRepeatOption != 'other'"
-                                    class="form-control input-sm
+                                    class="MakeSelect2
+                                        form-control input-sm
                                         RepeatFrequencyOptions-spacedSelect
                                         RepeatFrequencyOptions-yearlyOccurence
                                         RepeatFrequencyOptions-thirdSelect"
@@ -346,7 +350,8 @@
                                     ng-model="$parent.yearlyWeekDay"
                                     ng-options="w.name for w in weekdays"
                                     ng-disabled="yearlyRepeatOption != 'other'"
-                                    class="form-control input-sm
+                                    class="MakeSelect2
+                                        form-control input-sm
                                         RepeatFrequencyOptions-spacedSelect
                                         RepeatFrequencyOptions-thirdSelect"
                                 >
@@ -356,7 +361,8 @@
                                     ng-model="$parent.yearlyOtherMonth"
                                     ng-options="m.name for m in months"
                                     ng-disabled="yearlyRepeatOption != 'other'"
-                                    class="form-control input-sm
+                                    class="MakeSelect2
+                                        form-control input-sm
                                         RepeatFrequencyOptions-thirdSelect">
                                 </select>
                             </div>
@@ -451,7 +457,8 @@
                                     ng-model="$parent.schedulerEnd"
                                     ng-options="e.name for e in endOptions"
                                     required
-                                    class="form-control input-sm"
+                                    class="MakeSelect2
+                                        form-control input-sm"
                                     ng-change="schedulerEndChange()">
                                 </select>
                             </div>