diff --git a/ChangeLog b/ChangeLog
index 85ab02e2..c21d5b53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21444,3 +21444,7 @@
 	new host entries.
 	* Disabled cloning on hotkey data when creating new host entries
 	in rdadmin(1).
+2021-04-16 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed a bug in rdadmin(1) that caused the incorrect hostname to
+	populate in the 'Name' column after creating a new host entry in
+	the 'Rivendell Host List' dialog.
diff --git a/lib/rdstationlistmodel.cpp b/lib/rdstationlistmodel.cpp
index a7c0284d..48e282fc 100644
--- a/lib/rdstationlistmodel.cpp
+++ b/lib/rdstationlistmodel.cpp
@@ -298,7 +298,7 @@ void RDStationListModel::updateRowLine(int line)
 {
   if(line<d_texts.size()) {
     QString sql=sqlFields()+
-      "where NAME=\""+RDEscapeString(d_hostnames.at(0))+"\"";
+      "where NAME=\""+RDEscapeString(d_hostnames.at(line))+"\"";
     RDSqlQuery *q=new RDSqlQuery(sql);
     if(q->first()) {
       updateRow(line,q);