diff --git a/src/gui/newSong.cpp b/src/gui/newSong.cpp
index 08b30d7ae..fcd05d485 100644
--- a/src/gui/newSong.cpp
+++ b/src/gui/newSong.cpp
@@ -80,6 +80,7 @@ void FurnaceGUI::drawSysDefs(std::vector<FurnaceGUISysDef>& category, bool& acce
           ImGui::PushTextWrapPos(MIN(scrW*dpiScale,400.0f*dpiScale));
           ImGui::Text("%s (x%d): ",sysDef->name,chipCounts[chip]);
           ImGui::Text("%s",sysDef->description);
+          if (settings.sysTooltipChannelColors) drawSystemChannelInfo(sysDef);
           ImGui::PopTextWrapPos();
           if (chipIndex+1<chips.size()) {
             ImGui::Separator();
diff --git a/src/gui/sysManager.cpp b/src/gui/sysManager.cpp
index 1706b8b7b..a747ae9b5 100644
--- a/src/gui/sysManager.cpp
+++ b/src/gui/sysManager.cpp
@@ -24,12 +24,15 @@
 #include <imgui.h>
 
 void FurnaceGUI::drawSystemChannelInfo(const DivSysDef* whichDef) {
-  for (int i=0; i<whichDef->channels; i++) {
+  for (int i=0; i<whichDef->channels-1; i++) {
     ImGui::PushStyleColor(ImGuiCol_Button,ImGui::GetColorU32(uiColors[whichDef->chanTypes[i]+GUI_COLOR_CHANNEL_FM]));
     ImGui::SmallButton("##ChanTypeColorThing");
     ImGui::SameLine();
     ImGui::PopStyleColor();
   }
+  ImGui::PushStyleColor(ImGuiCol_Button,ImGui::GetColorU32(uiColors[whichDef->chanTypes[whichDef->channels-1]+GUI_COLOR_CHANNEL_FM]));
+  ImGui::SmallButton("##ChanTypeColorThing");
+  ImGui::PopStyleColor(); // so we don't get an extra sameline
 }
 
 void FurnaceGUI::drawSysManager() {