diff --git a/web/app/assets/javascripts/scheduled_session.js b/web/app/assets/javascripts/scheduled_session.js
index fee6de44c..d7c7cf4f1 100644
--- a/web/app/assets/javascripts/scheduled_session.js
+++ b/web/app/assets/javascripts/scheduled_session.js
@@ -175,7 +175,7 @@
       createSessionSettings.startDate = createSessionSettings.startDate || (new Date().toDateString());
       $("#session-start-date").val(createSessionSettings.startDate);
 
-      toggleDate();
+      toggleDate(true);
       toggleStartTime();
       toggleStepStatus();
     }
@@ -875,7 +875,7 @@
 
     }
 
-    function toggleDate() {
+    function toggleDate(dontRebuildDropdowns) {
       var selectedDate = new Date($('#session-start-date').val());
       var currentDate = new Date();
       var startIndex = 0;
@@ -897,10 +897,10 @@
         createSessionSettings.startTime = defaultTimeArray[startIndex];
       $startTimeList.val(createSessionSettings.startTime);
 
-      toggleStartTime();
+      toggleStartTime(dontRebuildDropdowns);
     }
 
-    function toggleStartTime() {
+    function toggleStartTime(dontRebuildDropdowns) {
       var valueSelected = $startTimeList.find('option:selected').val();
       var startIndex = defaultTimeArray.indexOf(valueSelected) + 2;
 
@@ -921,8 +921,12 @@
 
       $endTimeList.val(createSessionSettings.endTime);
 
-      context.JK.dropdown($startTimeList);
-      context.JK.dropdown($endTimeList);
+      if(!dontRebuildDropdowns) {
+        logger.debug("rebuilding start/end time dropdowns")
+        context.JK.dropdown($startTimeList);
+        context.JK.dropdown($endTimeList);
+      }
+
     }
 
     function initializeControls() {
@@ -933,7 +937,7 @@
       });
       $("#session-start-date").datepicker({
           dateFormat: "D d MM yy",
-          onSelect: toggleDate
+          onSelect: function() { toggleDate(); }
         }
       );
 
@@ -1107,7 +1111,7 @@
 
     function events() {
       $createTypes.on("ifChanged", toggleCreateType);
-      $startTimeList.on('change', toggleStartTime);
+      $startTimeList.on('change', function() { toggleStartTime(); });
       $btnSelectFiles.on('click', toggleSelectFiles);
       $('#session-step-2 #session-select-files').on('change', changeSelectedFiles);
       $policyTypes.on("ifChanged", togglePolicyTypeChanged);