diff --git a/src/components/chart/state-history-chart-timeline.ts b/src/components/chart/state-history-chart-timeline.ts
index 39a22c827c..89a59a7513 100644
--- a/src/components/chart/state-history-chart-timeline.ts
+++ b/src/components/chart/state-history-chart-timeline.ts
@@ -214,7 +214,7 @@ export class StateHistoryChartTimeline extends LitElement {
         },
         axisLabel: {
           show: showNames,
-          width: labelWidth - labelMargin,
+          width: labelWidth,
           overflow: "truncate",
           margin: labelMargin,
           formatter: (id: string) => {
diff --git a/src/util/text.ts b/src/util/text.ts
index b332c2ec0a..3615c0bc4d 100644
--- a/src/util/text.ts
+++ b/src/util/text.ts
@@ -21,5 +21,8 @@ export function measureTextWidth(
   }
 
   context.font = `${fontSize}px ${fontFamily}`;
-  return Math.ceil(context.measureText(text).width);
+  const textMetrics = context.measureText(text);
+  return Math.ceil(
+    textMetrics.actualBoundingBoxRight + textMetrics.actualBoundingBoxLeft
+  );
 }