diff --git a/ChangeLog b/ChangeLog
index 827ecce3..c966f3f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17902,3 +17902,6 @@
 2018-10-24 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed a bug in rddbmgr(8) that caused multiple default records
 	to be created in 'SERVICE_PERMS' when creating a new database.
+2018-10-24 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed a regression in rdadmin(1) that threw a segfault when the
+	'OK' button wash pushed in the 'Configure RDCatch' dialog.
diff --git a/rdadmin/edit_decks.cpp b/rdadmin/edit_decks.cpp
index 97c8e835..3569d888 100644
--- a/rdadmin/edit_decks.cpp
+++ b/rdadmin/edit_decks.cpp
@@ -771,8 +771,10 @@ void EditDecks::WriteRecord(int chan)
 
 int EditDecks::GetMatrix()
 {
-  if(edit_swmatrix_box->currentItem()<(int)edit_matrix_ids.size()) {
-    return edit_matrix_ids[edit_swmatrix_box->currentItem()];
+  if(edit_swmatrix_box->currentItem()>=0) {
+    if(edit_swmatrix_box->currentItem()<(int)edit_matrix_ids.size()) {
+      return edit_matrix_ids[edit_swmatrix_box->currentItem()];
+    }
   }
   return -1;
 }