diff --git a/src/gui/sysManager.cpp b/src/gui/sysManager.cpp
index a747ae9b5..f55233770 100644
--- a/src/gui/sysManager.cpp
+++ b/src/gui/sysManager.cpp
@@ -24,15 +24,12 @@
 #include <imgui.h>
 
 void FurnaceGUI::drawSystemChannelInfo(const DivSysDef* whichDef) {
-  for (int i=0; i<whichDef->channels-1; i++) {
+  for (int i=0; i<whichDef->channels; i++) {
     ImGui::PushStyleColor(ImGuiCol_Button,ImGui::GetColorU32(uiColors[whichDef->chanTypes[i]+GUI_COLOR_CHANNEL_FM]));
     ImGui::SmallButton("##ChanTypeColorThing");
-    ImGui::SameLine();
+    if (i<whichDef->channels-1) 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() {