diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index f15f9e099..dc16d657d 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -627,7 +627,11 @@ class ScheduleController extends Zend_Controller_Action
             if (!$showInstance->getShow()->isRepeating()) {
                 $formWhen->disableStartDateAndTime();
             } else {
-                $formWhen->getElement('add_show_start_date')->setOptions(array('disabled' => true));
+                $nextFutureRepeatShow = $show->getNextFutureRepeatShowTime();
+                $formWhen->getElement('add_show_start_date')->setValue($nextFutureRepeatShow["starts"]->format("Y-m-d"));
+                $formWhen->getElement('add_show_start_time')->setValue($nextFutureRepeatShow["starts"]->format("H:i"));
+                $formWhen->getElement('add_show_end_date_no_repeat')->setValue($nextFutureRepeatShow["ends"]->format("Y-m-d"));
+                $formWhen->getElement('add_show_end_time')->setValue($nextFutureRepeatShow["ends"]->format("H:i"));
             }
         }
 
@@ -802,10 +806,16 @@ class ScheduleController extends Zend_Controller_Action
         }
         $data['add_show_record'] = $show->isRecorded();
 
-        $origianlShowStartDateTime = Application_Common_DateHelper::ConvertToLocalDateTime($show->getStartDateAndTime());
+        if ($show->isRepeating()) {
+             $nextFutureRepeatShow = $show->getNextFutureRepeatShowTime();
+             $originalShowStartDateTime = $nextFutureRepeatShow["starts"];
+        } else {
+            $originalShowStartDateTime = Application_Common_DateHelper::ConvertToLocalDateTime(
+                $show->getStartDateAndTime());
+        }
 
         $success = Application_Model_Schedule::addUpdateShow($data, $this,
-            $validateStartDate, $origianlShowStartDateTime, true,
+            $validateStartDate, $originalShowStartDateTime, true,
             $data['add_show_instance_id']);
 
         if ($success) {
diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index 933c2c841..f485e41bc 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -663,6 +663,30 @@ SQL;
         $con->exec($sql);
     }
 
+    public function getNextFutureRepeatShowTime()
+    {
+        $sql = <<<SQL
+SELECT starts, ends FROM cc_show_instances
+WHERE ends > now() at time zone 'UTC'
+AND show_id = :showId
+ORDER BY starts
+LIMIT 1
+SQL;
+        $result = Application_Common_Database::prepareAndExecute( $sql,
+            array( 'showId' => $this->getId() ), 'all' );
+        
+        foreach ($result as $r) {
+            $show["starts"] = new DateTime($r["starts"], new DateTimeZone('UTC'));
+            $show["ends"] = new DateTime($r["ends"], new DateTimeZone('UTC'));
+        }
+        $currentUser = Application_Model_User::getCurrentUser();
+        $currentUserId = $currentUser->getId();
+        $userTimezone = Application_Model_Preference::GetUserTimezone($currentUserId);
+        $show["starts"]->setTimezone(new DateTimeZone($userTimezone));
+        $show["ends"]->setTimezone(new DateTimeZone($userTimezone));
+        return $show;
+    }
+
     /**
      * Get the start date of the current show in UTC timezone.
      *