diff --git a/ChangeLog b/ChangeLog
index d828d126..8d38bbff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23216,3 +23216,7 @@
 	'next event' to disappear after changing the filtering settings.
 2022-08-03 Fred Gleason <fredg@paravelsystems.com>
 	* Incremented the package version to 4.0.0beta3int2.
+2022-08-04 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed a bug in rdcatch(1) that caused switch event endpoints
+	to be sorted alphabetically rather than by endpoint number in
+	the 'Edit Switcher Event' dialog.
diff --git a/rdcatch/edit_switchevent.cpp b/rdcatch/edit_switchevent.cpp
index 1d1b3ec8..f914cbf8 100644
--- a/rdcatch/edit_switchevent.cpp
+++ b/rdcatch/edit_switchevent.cpp
@@ -247,7 +247,7 @@ void EditSwitchEvent::activateMatrixData(const QString &str)
     "from `INPUTS` where "+
     "(`STATION_NAME`='"+RDEscapeString(edit_event_widget->stationName())+"')&&"+
     QString::asprintf("(`MATRIX`=%d) ",GetMatrix())+
-    "order by `NAME`";
+    "order by `NUMBER`";
   edit_input_box->clear();
   edit_input_box->insertItem(tr("--OFF--"));
   int input=edit_recording->switchSource();
@@ -275,7 +275,7 @@ void EditSwitchEvent::activateMatrixData(const QString &str)
     "from `OUTPUTS` where "+
     "(`STATION_NAME`='"+RDEscapeString(edit_event_widget->stationName())+"')&&"+
     QString::asprintf("(`MATRIX`=%d) ",GetMatrix())+
-    "order by `NAME`";
+    "order by `NUMBER`";
   edit_output_box->clear();
   int output=edit_recording->switchDestination();
   if((outputs=edit_matrix->outputs())>0) {