diff --git a/src/css/charts.scss b/src/css/charts.scss
index 4c6eb26..aaad096 100644
--- a/src/css/charts.scss
+++ b/src/css/charts.scss
@@ -98,7 +98,6 @@
 		text-align: left;
 		padding: 0px;
 		pointer-events: none;
-
 		.title {
 			display: block;
 			padding: 16px;
@@ -114,6 +113,12 @@
 			margin: 0;
 			white-space: nowrap;
 			list-style: none;
+
+			&.tooltip-grid {
+				display: grid;
+				grid-template-columns: repeat(4, minmax(0, 1fr));
+				gap: 5px;
+			}
 		}
 
 		li {
diff --git a/src/js/objects/SvgTip.js b/src/js/objects/SvgTip.js
index f6dfe6a..5dec933 100644
--- a/src/js/objects/SvgTip.js
+++ b/src/js/objects/SvgTip.js
@@ -42,6 +42,7 @@ export default class SvgTip {
 		this.hideTip();
 
 		this.title = this.container.querySelector('.title');
+		this.list = this.container.querySelector('.data-point-list');
 		this.dataPointList = this.container.querySelector('.data-point-list');
 
 		this.parent.addEventListener('mouseleave', () => {
@@ -59,13 +60,19 @@ export default class SvgTip {
 		} else {
 			title = `${this.titleName}<strong>${this.titleValue}</strong>`;
 		}
+
+		if (this.listValues.length > 4) {
+			this.list.classList.add('tooltip-grid');
+		} else {
+			this.list.classList.remove('tooltip-grid');
+		}
+
 		this.title.innerHTML = title;
 		this.dataPointList.innerHTML = '';
 
 		this.listValues.map((set, i) => {
 			const color = this.colors[i] || 'black';
 			let value = set.formatted === 0 || set.formatted ? set.formatted : set.value;
-
 			let li = $.create('li', {
 				innerHTML: `<div class="tooltip-legend" style="background: ${color};"></div>
 					<div>