diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 8d112f1c3..a2c832fff 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -836,9 +836,9 @@ StTooltip StLabel {
 
 /* Calendar popup */
 
-#calendarArea {
-    /* this is the width of the entire popup */
-    min-width: 600px;
+#calendarEventsArea {
+    /* this is the width of the second column of the popup */
+    min-width: 400px;
 }
 
 .calendar-vertical-separator {
diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 4a4b10323..1855c3a54 100644
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -61,7 +61,7 @@ DateMenuButton.prototype = {
         this._clock = new St.Label();
         this.actor.set_child(this._clock);
 
-        hbox = new St.BoxLayout({name: 'calendarArea'});
+        hbox = new St.BoxLayout({name: 'calendarArea' });
         this.menu.addActor(hbox);
 
         // Fill up the first column
@@ -101,8 +101,8 @@ DateMenuButton.prototype = {
         hbox.add(item);
 
         // Fill up the second column
-
-        vbox = new St.BoxLayout({vertical: true});
+        vbox = new St.BoxLayout({name: 'calendarEventsArea',
+                                 vertical: true});
         hbox.add(vbox, { expand: true });
 
         // Event list