diff --git a/hammond-gtk/resources/gtk/headerbar.ui b/hammond-gtk/resources/gtk/headerbar.ui
index 9183a43..68c4541 100644
--- a/hammond-gtk/resources/gtk/headerbar.ui
+++ b/hammond-gtk/resources/gtk/headerbar.ui
@@ -125,7 +125,6 @@
         <property name="receives_default">False</property>
         <property name="tooltip_text" translatable="yes">Add a new feed</property>
         <property name="valign">center</property>
-        <property name="popover">add_popover</property>
         <child>
           <object class="GtkImage" id="add-button-image2">
             <property name="visible">True</property>
diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs
index 2244c0c..3b5f17e 100644
--- a/hammond-gtk/src/headerbar.rs
+++ b/hammond-gtk/src/headerbar.rs
@@ -72,6 +72,8 @@ impl Header {
             add_popover.hide();
         }));
 
+        self.add_toggle.set_popover(&add_popover);
+
         let switch = &self.switch;
         let add_toggle = &self.add_toggle;
         let show_title = &self.show_title;