diff --git a/ChangeLog b/ChangeLog
index 63549f38..f42845a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19749,7 +19749,6 @@
 	* Fixed a regression in rdairplay(1) that caused two events to be
 	started by a single spacebar tap if a SoundPanel event had been
 	played previously.
-<<<<<<< HEAD
 2020-04-08 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed a bug in rdlogmanager(1) that caused the initial event
 	in an imported set to fail receive the proper time and transition
@@ -19764,3 +19763,6 @@
 2020-04-08 Patrick Linstruth <patrick@deltecent.com>
 	* Fixed a bug in rdairplay(1) with HourSelector::updateTimeData()
 	where timer was not set properly when crossing midnight.
+2020-04-08 Patrick Linstruth <patrick@deltecent.com>
+	* Modified rdairplay(1) to always scroll log to the top when using
+	the hour selector.
diff --git a/rdairplay/list_log.cpp b/rdairplay/list_log.cpp
index ec47c4ce..ab1005e5 100644
--- a/rdairplay/list_log.cpp
+++ b/rdairplay/list_log.cpp
@@ -586,6 +586,8 @@ void ListLog::selectHour(int hour)
   while(item!=NULL) {
     if(PredictedStartHour(item)==hour) {
       list_log_list->clearSelection();
+      // Always start from the bottom so visible item is at the top
+      list_log_list->ensureItemVisible(list_log_list->lastItem());
       list_log_list->ensureItemVisible(item);
       list_log_list->setSelected(item,true);
       return;