diff --git a/src/Chart.cpp b/src/Chart.cpp
index e658c549..9d3d1d08 100644
--- a/src/Chart.cpp
+++ b/src/Chart.cpp
@@ -58,7 +58,8 @@ Chart::Chart (const ChartConfig& configuration) :
   color_label(configuration.color_label),
   color_exclusion(configuration.color_exclusion),
   tag_colors(configuration.tag_colors),
-  cell_width(60 / minutes_per_char + spacing)
+  cell_width(60 / minutes_per_char + spacing),
+  reference_hour(reference_datetime.hour ())
 { }
 
 std::string Chart::render (
@@ -218,7 +219,7 @@ std::pair<int, int> Chart::determineHourRange (
 
   if (first_hour == 23 && last_hour == 0)
   {
-    first_hour = reference_datetime.hour ();
+    first_hour = reference_hour;
     last_hour = std::min (first_hour + 1, 23);
   }
   else
@@ -234,18 +235,11 @@ std::pair<int, int> Chart::determineHourRange (
 std::string Chart::renderAxis (const int first_hour, const int last_hour)
 {
   std::stringstream out;
-  auto current_hour = reference_datetime.hour ();
 
   for (int hour = first_hour; hour <= last_hour; hour++)
   {
-    if (hour == current_hour)
-    {
-      out << color_today.colorize (leftJustify (hour, cell_width));
-    }
-    else
-    {
-      out << color_label.colorize (leftJustify (hour, cell_width));
-    }
+    auto color = getHourColor (hour);
+    out << color.colorize (leftJustify (hour, cell_width));
   }
 
   if (with_totals)
@@ -330,6 +324,12 @@ Color Chart::getDayColor (
   return Color {};
 }
 
+////////////////////////////////////////////////////////////////////////////////
+Color Chart::getHourColor (int hour) const
+{
+  return hour == reference_hour ? color_today : color_label;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 std::string Chart::renderTotal (time_t work)
 {
diff --git a/src/Chart.h b/src/Chart.h
index 0dea49a2..86748b86 100644
--- a/src/Chart.h
+++ b/src/Chart.h
@@ -58,6 +58,7 @@ private:
   std::pair <int, int> determineHourRange (const Interval&, const std::vector <Interval>&);
 
   Color getDayColor (const Datetime&, const std::map <Datetime, std::string>&);
+  Color getHourColor (int) const;
 
   const Datetime reference_datetime;
   const bool with_label_month;
@@ -79,7 +80,9 @@ private:
   const Color color_label;
   const Color color_exclusion;
   const std::map<std::string, Color> tag_colors;
+
   const int cell_width;
+  const int reference_hour;
 };
 
 #endif