diff --git a/src/gui/views/gcal-month-view-row.c b/src/gui/views/gcal-month-view-row.c
index 95920381..20f90591 100644
--- a/src/gui/views/gcal-month-view-row.c
+++ b/src/gui/views/gcal-month-view-row.c
@@ -431,8 +431,16 @@ gcal_month_view_row_measure (GtkWidget      *widget,
                           NULL);
 
 
-      minimum += child_minimum;
-      natural += child_natural;
+      if (orientation == GTK_ORIENTATION_HORIZONTAL)
+        {
+          minimum += child_minimum;
+          natural += child_natural;
+        }
+      else
+        {
+          minimum = MAX(minimum, child_minimum);
+          natural = MAX(natural, child_natural);
+        }
     }
 
   if (out_minimum)
diff --git a/src/gui/views/gcal-month-view.c b/src/gui/views/gcal-month-view.c
index af5d245d..7c135f89 100644
--- a/src/gui/views/gcal-month-view.c
+++ b/src/gui/views/gcal-month-view.c
@@ -1419,11 +1419,23 @@ gcal_month_view_measure (GtkWidget      *widget,
         }
     }
 
-  if (minimum)
-    *minimum = minimum_header_size + minimum_row_size;
 
-  if (natural)
-    *natural = natural_header_size + natural_row_size;
+  if (orientation == GTK_ORIENTATION_VERTICAL)
+    {
+      if (minimum)
+        *minimum = minimum_header_size + minimum_row_size;
+
+      if (natural)
+        *natural = natural_header_size + natural_row_size;
+    }
+  else
+    {
+      if (minimum)
+        *minimum = MAX(minimum_header_size, minimum_row_size);
+
+      if (natural)
+        *natural = MAX(natural_header_size, natural_row_size);
+    }
 
   if (minimum_baseline)
     *minimum_baseline = -1;