diff --git a/data/theme/gtk-styles.css b/data/theme/gtk-styles.css
index 7204df1b..200b951c 100644
--- a/data/theme/gtk-styles.css
+++ b/data/theme/gtk-styles.css
@@ -124,8 +124,6 @@ GcalYearView GtkScrolledWindow {
 
 GcalYearView GtkButton {
     border-radius: 0;
-    border-left-width: 0;
-    border-right-width: 0;
     border-bottom-width: 0;
 }
 
diff --git a/data/ui/year-view.ui b/data/ui/year-view.ui
index 0d12b26d..8eedf4cb 100644
--- a/data/ui/year-view.ui
+++ b/data/ui/year-view.ui
@@ -20,26 +20,34 @@
      </packing>
     </child>
     <child>
-      <object class="GtkOverlay" id="sidebar">
+      <object class="GtkBox" id="sidebar">
         <property name="width_request">200</property>
-        <child type="overlay">
-          <object class="GtkButton" id="add_event_button">
-            <property name="visible">True</property>
-            <property name="valign">end</property>
-            <property name="label" translatable="yes">Add new event…</property>
-            <signal name="clicked" handler="add_event_clicked_cb" object="GcalYearView" swapped="yes" />
-          </object>
-        </child>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkScrolledWindow">
             <property name="visible">True</property>
             <property name="shadow_type">out</property>
+            <property name="vexpand">True</property>
             <child>
               <object class="GtkListBox" id="events_sidebar">
                 <property name="visible">True</property>
               </object>
             </child>
           </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="add_event_button">
+            <property name="visible">True</property>
+            <property name="valign">end</property>
+            <property name="label" translatable="yes">Add new event…</property>
+            <signal name="clicked" handler="add_event_clicked_cb" object="GcalYearView" swapped="yes" />
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
     </child>