diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index 14f4b70..1a13f53 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -2369,12 +2369,15 @@ side_panel_visibility_changed (GtkWidget   *panel,
 		if (tokens)
 		{
 			gchar *layout_headerbar;
+			gchar *layout_side_headerbar;
 
 			layout_headerbar = g_strdup_printf ("%c%s", ':', tokens[1]);
+			layout_side_headerbar = g_strdup_printf ("%s%c",  tokens[0], ':');
 			gtk_header_bar_set_decoration_layout (GTK_HEADER_BAR (window->priv->headerbar), layout_headerbar);
-			gtk_header_bar_set_decoration_layout (GTK_HEADER_BAR (window->priv->side_headerbar), tokens[0]);
+			gtk_header_bar_set_decoration_layout (GTK_HEADER_BAR (window->priv->side_headerbar), layout_side_headerbar);
 
 			g_free (layout_headerbar);
+			g_free (layout_side_headerbar);
 			g_strfreev (tokens);
 		}
 	}
diff --git a/gedit/resources/ui/gedit-window.ui b/gedit/resources/ui/gedit-window.ui
index 147f2f1..8c8a8bf 100644
--- a/gedit/resources/ui/gedit-window.ui
+++ b/gedit/resources/ui/gedit-window.ui
@@ -16,6 +16,7 @@
           <object class="GtkHeaderBar" id="side_headerbar">
             <property name="visible" bind-source="side_panel" bind-property="visible" bind-flags="sync-create"/>
             <property name="title" translatable="yes">Documents</property>
+            <property name="show_close_button">True</property>
             <style>
               <class name="gedit-titlebar-left"/>
               <class name="titlebar"/>
