diff --git a/src/gui/header_bar.rs b/src/gui/header_bar.rs
index 46566e1..01636c1 100644
--- a/src/gui/header_bar.rs
+++ b/src/gui/header_bar.rs
@@ -60,6 +60,8 @@ pub mod imp {
     pub struct HeaderBar {
         #[template_child]
         child_box: TemplateChild<gtk::Box>,
+        #[template_child]
+        titlebar: TemplateChild<libadwaita::ViewSwitcherTitle>,
 
         title: RefCell<Option<String>>,
         child: RefCell<Option<Object>>,
@@ -118,6 +120,21 @@ pub mod imp {
         fn constructed(&self, obj: &Self::Type) {
             self.parent_constructed(obj);
             self.setup_actions(obj);
+
+            obj.connect_root_notify(clone!(@strong self.titlebar as titlebar => move |o| {
+                if let Some(root) = o.root() {
+                    let window = root
+                        .downcast::<crate::gui::window::Window>()
+                        .expect("Root to be window");
+                    window.connect_realize(clone!(@strong titlebar => move |w| {
+                        let stack = &w.imp().application_stack;
+                        let stack_switcher = &w.imp().application_stack_bar;
+                        titlebar
+                            .set_stack(Some(stack));
+                        titlebar.bind_property("title-visible", &stack_switcher.get(), "reveal").build();
+                    }));
+                }
+            }));
             obj.connect_notify_local(
                 Some("child"),
                 clone!(@strong self.child_box as b => move |obj, _| {
diff --git a/src/gui/window.rs b/src/gui/window.rs
index 097ae2a..a0a5e45 100644
--- a/src/gui/window.rs
+++ b/src/gui/window.rs
@@ -34,8 +34,6 @@ gtk::glib::wrapper! {
 
 impl Window {
     pub fn new(app: &gtk::Application) -> Self {
-        // Make sure HeaderBar is loaded.
-        let _ = super::header_bar::HeaderBar::new();
         Object::new(&[("application", app)]).expect("Failed to create Window")
     }
 
@@ -82,7 +80,10 @@ pub mod imp {
     #[template(resource = "/ui/window.ui")]
     pub struct Window {
         #[template_child]
-        application_stack: TemplateChild<libadwaita::ViewStack>,
+        pub(in crate::gui) application_stack: TemplateChild<libadwaita::ViewStack>,
+
+        #[template_child]
+        pub(in crate::gui) application_stack_bar: TemplateChild<libadwaita::ViewSwitcherBar>,
 
         #[template_child]
         pub(super) feed_page: TemplateChild<FeedPage>,
@@ -225,6 +226,8 @@ pub mod imp {
         type ParentType = libadwaita::ApplicationWindow;
 
         fn class_init(klass: &mut Self::Class) {
+            // Make sure HeaderBar is loaded.
+            crate::gui::header_bar::HeaderBar::ensure_type();
             Self::bind_template(klass);
         }
 
diff --git a/ui/header_bar.ui b/ui/header_bar.ui
index 383d382..4526e22 100644
--- a/ui/header_bar.ui
+++ b/ui/header_bar.ui
@@ -14,13 +14,17 @@
         <property name="vexpand">True</property>
         <property name="halign">GTK_ALIGN_FILL</property>
         <property name="valign">GTK_ALIGN_FILL</property>
-        <property name="title-widget">
-          <object class="AdwWindowTitle">
-            <binding name="title">
-              <lookup name="title" type="TFHeaderBar"/>
-            </binding>
+        <child type="title">
+          <object class="GtkBox">
+            <child>
+              <object class="AdwViewSwitcherTitle" id="titlebar">
+                <binding name="title">
+                  <lookup name="title" type="TFHeaderBar"/>
+                </binding>
+              </object>
+            </child>
           </object>
-        </property>
+        </child>
 
         <child>
           <object class="GtkBox" id="child_box">
diff --git a/ui/window.ui b/ui/window.ui
index b7b01c9..dbacc3b 100644
--- a/ui/window.ui
+++ b/ui/window.ui
@@ -55,7 +55,7 @@
         </child>
 
         <child>
-          <object class = "AdwViewSwitcher">
+          <object class="AdwViewSwitcherBar" id="application_stack_bar">
               <property name="hexpand">True</property>
               <property name="vexpand">False</property>
               <property name="halign">GTK_ALIGN_FILL</property>