diff --git a/ChangeLog b/ChangeLog
index b4dd940a..10080c43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19939,3 +19939,6 @@
 	* Dropped the 'RSS_SCHEMAS' table from the database.
 	* Incremented the database version to 325.
 	* Moved RSS template definitions to 'lib/rdfeed.h'.
+2020-05-17 Fred Gleason <fredg@paravelsystems.com>
+	* Updated interlocking logic in the 'Edit Feed' dialog in
+	rdadmin(1) to handle image assignments correctly.
diff --git a/rdadmin/edit_feed.cpp b/rdadmin/edit_feed.cpp
index 9cade257..679d793f 100644
--- a/rdadmin/edit_feed.cpp
+++ b/rdadmin/edit_feed.cpp
@@ -775,11 +775,14 @@ void EditFeed::UpdateControlState()
   bool custom_schema=
     feed_rss_schema_box->itemData(feed_rss_schema_box->currentIndex()).toInt()==
     RDFeed::CustomSchema;
+  bool item_image=feed_rss_schema_box->itemData(feed_rss_schema_box->currentIndex()).toInt()!=RDFeed::Rss202Schema;
 
   feed_is_superfeed_label->setDisabled(redirected);
   feed_is_superfeed_box->setDisabled(redirected);
   feed_is_superfeed_button->setDisabled(redirected||(!superfeed));
 
+  feed_list_images_button->setDisabled(redirected);
+
   feed_audience_metrics_check->setDisabled(redirected);
   feed_audience_metrics_label->setDisabled(redirected);
 
@@ -799,6 +802,8 @@ void EditFeed::UpdateControlState()
   feed_channel_copyright_label->setDisabled(redirected);
   feed_channel_language_label->setDisabled(redirected);
   feed_channel_description_label->setDisabled(redirected);
+  feed_channel_image_label->setDisabled(redirected);
+  feed_channel_image_box->setDisabled(redirected);
 
   feed_redirect_url_label->setEnabled(redirected);
   feed_redirect_url_edit->setEnabled(redirected);
@@ -841,6 +846,9 @@ void EditFeed::UpdateControlState()
   feed_media_link_mode_box->setDisabled(redirected||superfeed);
   feed_media_link_mode_label->setDisabled(redirected||superfeed);
 
+  feed_item_image_label->setEnabled(item_image&&(!redirected));
+  feed_item_image_box->setEnabled(item_image&&(!redirected));
+
   feed_header_xml_label->setDisabled(redirected||(!custom_schema));
   feed_header_xml_edit->setDisabled(redirected||(!custom_schema));