diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 09dbfa759..9d0738129 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -223,8 +223,8 @@ class Monitoring_ListController extends Controller
             'downtime_author'               => 'Author',
             'downtime_start'                => 'Start Time',
             'downtime_start'                => 'End Time',
-            'downtime_scheduled_start_time' => 'Scheduled Start',
-            'downtime_scheduled_end_time'   => 'Scheduled End',
+            'downtime_scheduled_start' => 'Scheduled Start',
+            'downtime_scheduled_end'   => 'Scheduled End',
             'downtime_duration'             => 'Duration',
         ));
         $this->handleFormatRequest($query);
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
index 77b08656d..4da0191d8 100644
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
@@ -47,6 +47,7 @@ class DowntimeQuery extends IdoQuery
             'downtime_is_flexible'          => 'CASE WHEN sd.is_fixed = 0 THEN 1 ELSE 0 END',
             'downtime_triggered_by_id'      => 'sd.triggered_by_id',
             'downtime_scheduled_start' => 'UNIX_TIMESTAMP(sd.scheduled_start_time)',
+            'downtime_scheduled_end' => 'UNIX_TIMESTAMP(sd.scheduled_end_time)',
             'downtime_start'                => "UNIX_TIMESTAMP(CASE WHEN sd.trigger_time != '0000-00-00 00:00:00' then sd.trigger_time ELSE sd.scheduled_start_time END)",
             'downtime_end'                  => 'UNIX_TIMESTAMP(sd.scheduled_end_time)',
             'downtime_duration'             => 'sd.duration',
diff --git a/modules/monitoring/library/Monitoring/DataView/Downtime.php b/modules/monitoring/library/Monitoring/DataView/Downtime.php
index 4bf9e41cc..73eb5c547 100644
--- a/modules/monitoring/library/Monitoring/DataView/Downtime.php
+++ b/modules/monitoring/library/Monitoring/DataView/Downtime.php
@@ -47,6 +47,7 @@ class Downtime extends DataView
             'downtime_is_flexible',
             'downtime_start',
             'downtime_scheduled_start',
+            'downtime_scheduled_end',
             'downtime_end',
             'downtime_duration',
             'downtime_is_in_effect',