diff --git a/examples/example-window.c b/examples/example-window.c
index 004f18acc68329256a0d956322bed75c60d1e0be..f632d6b4b1703c70f425328c0b4b7be8c88b8ae2 100644
--- a/examples/example-window.c
+++ b/examples/example-window.c
@@ -38,23 +38,6 @@ example_window_key_pressed_cb (GtkWidget     *sender,
   return FALSE;
 }
 
-static void
-update (ExampleWindow *self)
-{
-  HdyFold fold = hdy_leaflet_get_fold (self->content_box);
-
-  gtk_header_bar_set_show_close_button (self->header_bar, fold == HDY_FOLD_FOLDED);
-  gtk_widget_set_visible (GTK_WIDGET (self->back), fold == HDY_FOLD_FOLDED);
-}
-
-static void
-example_window_notify_fold_cb (GObject       *sender,
-                                 GParamSpec    *pspec,
-                                 ExampleWindow *self)
-{
-  update (self);
-}
-
 static void
 example_window_notify_visible_child_cb (GObject       *sender,
                                         GParamSpec    *pspec,
@@ -248,7 +231,6 @@ example_window_class_init (ExampleWindowClass *klass)
   gtk_widget_class_bind_template_child (widget_class, ExampleWindow, adj_arrows_count);
   gtk_widget_class_bind_template_child (widget_class, ExampleWindow, adj_arrows_duration);
   gtk_widget_class_bind_template_callback_full (widget_class, "key_pressed_cb", G_CALLBACK(example_window_key_pressed_cb));
-  gtk_widget_class_bind_template_callback_full (widget_class, "notify_fold_cb", G_CALLBACK(example_window_notify_fold_cb));
   gtk_widget_class_bind_template_callback_full (widget_class, "notify_visible_child_cb", G_CALLBACK(example_window_notify_visible_child_cb));
   gtk_widget_class_bind_template_callback_full (widget_class, "back_clicked_cb", G_CALLBACK(example_window_back_clicked_cb));
   gtk_widget_class_bind_template_callback_full (widget_class, "submitted_cb", G_CALLBACK(example_window_submitted_cb));
@@ -268,6 +250,4 @@ example_window_init (ExampleWindow *self)
   gtk_widget_init_template (GTK_WIDGET (self));
 
   hdy_leaflet_set_visible_child (self->content_box, GTK_WIDGET (self->stack));
-
-  update (self);
 }
diff --git a/examples/example-window.ui b/examples/example-window.ui
index d1d9e49f8b370483b98477b0552100367b6dcd0a..15fec1849d71d961aaab3d5b5faddb7624d2a77f 100644
--- a/examples/example-window.ui
+++ b/examples/example-window.ui
@@ -38,6 +38,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="title">Handy Widget Factory</property>
+                <property name="show_close_button" bind-source="header_box" bind-property="folded" bind-flags="sync-create"/>
               </object>
               <packing>
                 <property name="name">sidebar</property>
@@ -64,6 +65,7 @@
                     <property name="receives_default">False</property>
                     <property name="valign">center</property>
                     <property name="use-underline">True</property>
+                    <property name="visible" bind-source="header_box" bind-property="folded" bind-flags="sync-create"/>
                     <signal name="clicked" handler="back_clicked_cb"/>
                     <style>
                       <class name="image-button"/>
@@ -98,7 +100,6 @@
         <property name="can_focus">False</property>
         <property name="mode_transition_type">slide</property>
         <property name="child_transition_type">slide</property>
-        <signal name="notify::fold" handler="notify_fold_cb" after="yes" swapped="no"/>
         <child>
           <object class="GtkStackSidebar" id="sidebar">
             <property name="width_request">270</property>
diff --git a/src/hdy-leaflet.c b/src/hdy-leaflet.c
index da6ac71b059593774fcc857687e7a03e1a0c8f5a..33a544515334699bf17f456e3be74d03febc6ba3 100644
--- a/src/hdy-leaflet.c
+++ b/src/hdy-leaflet.c
@@ -56,6 +56,7 @@
 enum {
   PROP_0,
   PROP_FOLD,
+  PROP_FOLDED,
   PROP_HHOMOGENEOUS_FOLDED,
   PROP_VHOMOGENEOUS_FOLDED,
   PROP_HHOMOGENEOUS_UNFOLDED,
@@ -731,6 +732,8 @@ hdy_leaflet_set_fold (HdyLeaflet *self,
 
   g_object_notify_by_pspec (G_OBJECT (self),
                             props[PROP_FOLD]);
+  g_object_notify_by_pspec (G_OBJECT (self),
+                            props[PROP_FOLDED]);
 }
 
 /**
@@ -2362,6 +2365,9 @@ hdy_leaflet_get_property (GObject    *object,
   case PROP_FOLD:
     g_value_set_enum (value, hdy_leaflet_get_fold (self));
     break;
+  case PROP_FOLDED:
+    g_value_set_boolean (value, hdy_leaflet_get_fold (self) == HDY_FOLD_FOLDED);
+    break;
   case PROP_HHOMOGENEOUS_FOLDED:
     g_value_set_boolean (value, hdy_leaflet_get_homogeneous (self, TRUE, GTK_ORIENTATION_HORIZONTAL));
     break;
@@ -2701,6 +2707,13 @@ hdy_leaflet_class_init (HdyLeafletClass *klass)
                        HDY_TYPE_FOLD, HDY_FOLD_UNFOLDED,
                        G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY);
 
+  props[PROP_FOLDED] =
+    g_param_spec_boolean ("folded",
+                          _("Folded"),
+                          _("Whether the widget is folded"),
+                          FALSE,
+                          G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY);
+
   /**
    * HdyLeaflet:hhomogeneous_folded:
    *