diff --git a/openpilot/starpilot/ui/home.py b/openpilot/starpilot/ui/home.py
index c8ac2c3512..a10e5a895a 100644
--- a/openpilot/starpilot/ui/home.py
+++ b/openpilot/starpilot/ui/home.py
@@ -235,8 +235,9 @@ class HomeView:
       while text and self._measure(text, FontRole.ROMAN, size).width > width:
         text = text[:-2].rstrip('…') + '…'
       self._text(text, FontRole.ROMAN, size, 6, y, color)
-    if state.commit_date:
-      self._text(state.commit_date, FontRole.ROMAN, 30, 526 - date_width, 98, rl.GRAY)
+      if y == 98 and state.commit_date:
+        date_x = 6 + self._measure(text, FontRole.ROMAN, size).width + 16
+        self._text(state.commit_date, FontRole.ROMAN, 30, date_x, y, rl.GRAY)
     self._icon("icons_mici/settings.png", 48, 48, 8, 192, 0.9)
     if state.network == "wifi":
       suffix = "none" if state.network_strength == 0 else "medium" if state.network_strength == 3 else "full" if state.network_strength >= 4 else "low"
diff --git a/openpilot/starpilot/ui/tests/test_home_commit_date.py b/openpilot/starpilot/ui/tests/test_home_commit_date.py
index 447b35e4cb..dc14927348 100644
--- a/openpilot/starpilot/ui/tests/test_home_commit_date.py
+++ b/openpilot/starpilot/ui/tests/test_home_commit_date.py
@@ -31,7 +31,9 @@ class TestHomeCommitDate(unittest.TestCase):
     date = drawn["Sep 15"]
     self.assertEqual(date[1:3], (FontRole.ROMAN, 30))
     self.assertEqual(date[4], 98)
-    self.assertEqual(date[3] + self.view._measure(*date[:3]).width, 526)
+    version = drawn["6.7.7  Dom"]
+    self.assertEqual(date[3], version[3] + self.view._measure(*version[:3]).width + 16)
+    self.assertLessEqual(date[3] + self.view._measure(*date[:3]).width, 526)
     self.view._icon.assert_any_call("icons_mici/settings.png", 48, 48, 8, 192, 0.9)
     self.view._icon.assert_any_call("icons_mici/settings/network/wifi_strength_slash.png", 50, 44, 76, 190.5, 0.9)
     self.view._mode_atom.assert_called_once_with(self.state.mode, 146, 192)
@@ -47,7 +49,8 @@ class TestHomeCommitDate(unittest.TestCase):
     date = drawn["Sep 15"]
     version = next(args for args in drawn.values() if args[0].startswith(self.state.version))
     self.assertTrue(version[0].endswith("…"))
-    self.assertLessEqual(version[3] + self.view._measure(*version[:3]).width + 16, date[3])
+    self.assertEqual(version[3] + self.view._measure(*version[:3]).width + 16, date[3])
+    self.assertLessEqual(date[3] + self.view._measure(*date[:3]).width, 526)
     self.assertEqual(drawn[self.state.model_label][2:5], (30, 6, 140))
 
   def test_large_profile_still_uses_large_renderer(self):