diff --git a/data/ui/edit-dialog.ui b/data/ui/edit-dialog.ui
index 9206f563..034b8e31 100644
--- a/data/ui/edit-dialog.ui
+++ b/data/ui/edit-dialog.ui
@@ -237,43 +237,69 @@
               </packing>
             </child>
             <child>
-              <object class="GcalTimeSelector" id="start_time_selector">
+              <object class="GtkBox" id="start_date_box">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GcalDateSelector" id="start_date_selector">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
+                <property name="homogeneous">True</property>
+                <style>
+                  <class name="linked" />
+                </style>
+                <child>
+                  <object class="GcalDateSelector" id="start_date_selector">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GcalTimeSelector" id="start_time_selector">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </object>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">1</property>
+                <property name="width">2</property>
               </packing>
             </child>
             <child>
-              <object class="GcalTimeSelector" id="end_time_selector">
+              <object class="GtkBox" id="end_date_box">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GcalDateSelector" id="end_date_selector">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can_focus">False</property>
+                <property name="homogeneous">True</property>
+                <style>
+                  <class name="linked" />
+                </style>
+                <child>
+                  <object class="GcalDateSelector" id="end_date_selector">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GcalTimeSelector" id="end_time_selector">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                  </object>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">2</property>
+                <property name="width">2</property>
               </packing>
             </child>
             <child>