diff --git a/src/components/panels/Extruder/ExtruderControlPanelTools.vue b/src/components/panels/Extruder/ExtruderControlPanelTools.vue
index 5cce8979d..1ae8b6bc0 100644
--- a/src/components/panels/Extruder/ExtruderControlPanelTools.vue
+++ b/src/components/panels/Extruder/ExtruderControlPanelTools.vue
@@ -21,7 +21,8 @@ export default class ExtruderControlPanel extends Mixins(BaseMixin, ControlMixin
     mdiPrinter3dNozzle = mdiPrinter3dNozzle
 
     get rows() {
-        const cols = 6
+        const len = this.toolchangeMacros.length
+        const cols = Math.ceil(len / Math.ceil(len / 6))
         let rows = []
 
         for (let i = 0; i < this.toolchangeMacros.length; i += cols) {