diff --git a/octoprint_eeprom_marlin/data.py b/octoprint_eeprom_marlin/data.py
index 4d43a19..689e010 100644
--- a/octoprint_eeprom_marlin/data.py
+++ b/octoprint_eeprom_marlin/data.py
@@ -100,6 +100,17 @@
         "name": "Home Offset",
         "link": "https://marlinfw.org/docs/gcode/M206.html",
     },
+    "hotends_offset": {
+        "command": "M218",
+        "params": {
+            "X": {"type": "float2", "label": "X hotends offset", "units": "mm"},
+            "Y": {"type": "float2", "label": "Y hotends offset", "units": "mm"},
+            "Z": {"type": "float2", "label": "Z hotends offset", "units": "mm"},
+        },
+        "switches": ["T"],
+        "name": "Hotends Offset",
+        "link": "https://marlinfw.org/docs/gcode/M218.html",
+    },
     "endstop": {
         "command": "M666",
         "params": {
diff --git a/octoprint_eeprom_marlin/static/js/eeprom_marlin.js b/octoprint_eeprom_marlin/static/js/eeprom_marlin.js
index 9a722f2..65ead76 100755
--- a/octoprint_eeprom_marlin/static/js/eeprom_marlin.js
+++ b/octoprint_eeprom_marlin/static/js/eeprom_marlin.js
@@ -93,6 +93,8 @@ $(function () {
 
       eeprom.home_offset = create_eeprom_observables(["X", "Y", "Z"]);
 
+      eeprom.hotends_offset = create_eeprom_observables(["X", "Y", "Z"], ["T"]);
+
       eeprom.hotend_pid = create_eeprom_observables(["P", "I", "D"], ["E"]);
 
       eeprom.hotend_mpc = create_eeprom_observables(
diff --git a/octoprint_eeprom_marlin/templates/sub/tab-content.jinja2 b/octoprint_eeprom_marlin/templates/sub/tab-content.jinja2
index 595010c..6cbe1a9 100644
--- a/octoprint_eeprom_marlin/templates/sub/tab-content.jinja2
+++ b/octoprint_eeprom_marlin/templates/sub/tab-content.jinja2
@@ -57,6 +57,7 @@
 </div>
 <div id="eeprom_offset" class="tab-pane">
     {{ section("Home Offset", "home_offset") }}
+    {{ section("Hotends Offset", "hotends_offset") }}
     {{ section("Probe Offset", "probe_offset") }}
 </div>
 <div id="eeprom_pid" class="tab-pane">
diff --git a/octoprint_eeprom_marlin/templates/sub/tab-sidebar.jinja2 b/octoprint_eeprom_marlin/templates/sub/tab-sidebar.jinja2
index 49cbc9d..b450b72 100644
--- a/octoprint_eeprom_marlin/templates/sub/tab-sidebar.jinja2
+++ b/octoprint_eeprom_marlin/templates/sub/tab-sidebar.jinja2
@@ -11,7 +11,7 @@
     <li data-bind="visible: eeprom.max_acceleration.visible() || eeprom.print_acceleration.visible()">
         <a data-toggle="tab" href="#eeprom_acceleration">Acceleration</a>
     </li>
-    <li data-bind="visible: eeprom.home_offset.visible() || eeprom.probe_offset.visible()">
+    <li data-bind="visible: eeprom.home_offset.visible() || eeprom.hotends_offset.visible() || eeprom.probe_offset.visible()">
         <a data-toggle="tab" href="#eeprom_offset">Offsets</a>
     </li>
     <li data-bind="visible: eeprom.bed_pid.visible() || eeprom.hotend_pid.visible()">