diff --git a/src/Plug.vala b/src/Plug.vala
index d3c89d49..03fa6d42 100644
--- a/src/Plug.vala
+++ b/src/Plug.vala
@@ -78,7 +78,9 @@ public class MouseTouchpad.Plug : Switchboard.Plug {
             stack.add_named (mouse_view, "mouse");
             stack.add_named (touchpad_view, "touchpad");
 
-            var switcher = new Switchboard.SettingsSidebar (stack);
+            var switcher = new Switchboard.SettingsSidebar (stack) {
+                show_title_buttons = true
+            };
 
             hpaned = new Gtk.Paned (Gtk.Orientation.HORIZONTAL) {
                 start_child = switcher,
diff --git a/src/Views/Clicking.vala b/src/Views/Clicking.vala
index 66523a20..b35b6807 100644
--- a/src/Views/Clicking.vala
+++ b/src/Views/Clicking.vala
@@ -27,6 +27,8 @@ public class MouseTouchpad.ClickingView : Switchboard.SettingsPage {
     }
 
     construct {
+        show_end_title_buttons = true;
+
         var primary_button_label = new Granite.HeaderLabel (_("Primary Button"));
 
         var mouse_left = new Gtk.CheckButton () {
diff --git a/src/Views/Gestures.vala b/src/Views/Gestures.vala
index e58d6af8..bb1be01f 100644
--- a/src/Views/Gestures.vala
+++ b/src/Views/Gestures.vala
@@ -27,6 +27,8 @@ public class MouseTouchpad.GesturesView : Switchboard.SettingsPage {
     }
 
     construct {
+        show_end_title_buttons = true;
+
         var horizontal_swipe_header = new Granite.HeaderLabel (_("Swipe Horizontally"));
 
         var three_swipe_horizontal_label = new Gtk.Label (_("Three fingers:")) {
diff --git a/src/Views/Mouse.vala b/src/Views/Mouse.vala
index 1ad0b8e4..59ad5f8b 100644
--- a/src/Views/Mouse.vala
+++ b/src/Views/Mouse.vala
@@ -13,6 +13,8 @@ public class MouseTouchpad.MouseView : Switchboard.SettingsPage {
     }
 
     construct {
+        show_end_title_buttons = true;
+
         var pointer_speed_adjustment = new Gtk.Adjustment (0, -1, 1, 0.1, 0, 0);
 
         var pointer_speed_scale = new Gtk.Scale (HORIZONTAL, pointer_speed_adjustment) {
diff --git a/src/Views/Pointing.vala b/src/Views/Pointing.vala
index 3e219864..399c81dc 100644
--- a/src/Views/Pointing.vala
+++ b/src/Views/Pointing.vala
@@ -12,6 +12,8 @@ public class MouseTouchpad.PointingView : Switchboard.SettingsPage {
     }
 
     construct {
+        show_end_title_buttons = true;
+
         var keypad_pointer_switch = new Gtk.Switch () {
             halign = END,
             valign = CENTER
diff --git a/src/Views/Touchpad.vala b/src/Views/Touchpad.vala
index d1b88b37..038d1ac9 100644
--- a/src/Views/Touchpad.vala
+++ b/src/Views/Touchpad.vala
@@ -17,6 +17,8 @@ public class MouseTouchpad.TouchpadView : Switchboard.SettingsPage {
     }
 
     construct {
+        show_end_title_buttons = true;
+
         var pointer_speed_adjustment = new Gtk.Adjustment (0, -1, 1, 0.1, 0, 0);
 
         var pointer_speed_scale = new Gtk.Scale (HORIZONTAL, pointer_speed_adjustment) {