diff --git a/src/panels/lovelace/cards/energy/common/energy-chart-options.ts b/src/panels/lovelace/cards/energy/common/energy-chart-options.ts
index 2e576c7c9ebf..a5c5f1ba9b47 100644
--- a/src/panels/lovelace/cards/energy/common/energy-chart-options.ts
+++ b/src/panels/lovelace/cards/energy/common/energy-chart-options.ts
@@ -72,7 +72,10 @@ export function getCommonOptions(
     yAxis: {
       type: "value",
       name: unit,
-      nameGap: 5,
+      nameGap: 2,
+      nameTextStyle: {
+        align: "left",
+      },
       axisLabel: {
         formatter: (value: number) => formatNumber(Math.abs(value), locale),
       },
@@ -81,10 +84,10 @@ export function getCommonOptions(
       },
     },
     grid: {
-      top: 35,
-      bottom: 10,
-      left: 10,
-      right: 10,
+      top: 15,
+      bottom: 0,
+      left: 1,
+      right: 1,
       containLabel: true,
     },
     tooltip: {
diff --git a/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts
index a1501155b9e3..0e0b60b16add 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts
@@ -193,9 +193,10 @@ export class HuiEnergyDevicesDetailGraphCard
           icon: "circle",
         },
         grid: {
+          top: 45,
           bottom: 0,
-          left: 5,
-          right: 5,
+          left: 1,
+          right: 1,
           containLabel: true,
         },
       };