diff --git a/retroshare-gui/src/gui/ChannelFeed.cpp b/retroshare-gui/src/gui/ChannelFeed.cpp
index dc36b1271..0c8ebcc2a 100644
--- a/retroshare-gui/src/gui/ChannelFeed.cpp
+++ b/retroshare-gui/src/gui/ChannelFeed.cpp
@@ -626,9 +626,12 @@ void ChannelFeed::updateChannelMsgs()
 		subscribeButton->setEnabled(false);
 		unsubscribeButton->setEnabled(false);
 		nameLabel->setText("No Channel Selected");
+		iconLabel->setEnabled(false);
 		return;
 	}
 	
+	iconLabel->setEnabled(true);
+	
 	/* set textcolor for Channel name  */
 	QString channelStr("<span style=\"font-size:22pt; font-weight:500;"
                                "color:#4F4F4F;\">%1</span>");