diff --git a/panels/mouse/gnome-mouse-properties.c b/panels/mouse/gnome-mouse-properties.c
index 5af129391..e74a59761 100644
--- a/panels/mouse/gnome-mouse-properties.c
+++ b/panels/mouse/gnome-mouse-properties.c
@@ -98,17 +98,14 @@ setup_touchpad_options (CcMouseProperties *self)
 	gboolean have_edge_scrolling;
 	gboolean have_tap_to_click;
 
-	gtk_widget_set_visible (self->touchpad_frame, !self->have_synaptics);
-	if (self->have_synaptics)
-		return;
-
-	gtk_widget_set_visible (self->touchpad_frame, self->have_touchpad);
-	if (!self->have_touchpad)
+	if (self->have_synaptics || !self->have_touchpad) {
+		gtk_widget_hide (self->touchpad_frame);
 		return;
+	}
 
 	cc_touchpad_check_capabilities (&have_two_finger_scrolling, &have_edge_scrolling, &have_tap_to_click);
 
-	gtk_widget_show_all (self->touchpad_frame);
+	gtk_widget_show (self->touchpad_frame);
 
 	gtk_widget_set_visible (self->two_finger_scrolling_row, have_two_finger_scrolling);
 	gtk_widget_set_visible (self->edge_scrolling_row, have_edge_scrolling);
diff --git a/panels/mouse/gnome-mouse-properties.ui b/panels/mouse/gnome-mouse-properties.ui
index 12c9876fa..9d5bfcd28 100644
--- a/panels/mouse/gnome-mouse-properties.ui
+++ b/panels/mouse/gnome-mouse-properties.ui
@@ -616,7 +616,6 @@
                               <object class="GtkListBoxRow" id="two_finger_scrolling_row">
                                 <property name="visible">False</property>
                                 <property name="can_focus">True</property>
-                                <property name="no_show_all">True</property>
                                 <property name="activatable">false</property>
                                 <child>
                                   <object class="GtkGrid" id="two_finger_scrolling_grid">
@@ -670,7 +669,6 @@
                               <object class="GtkListBoxRow" id="edge_scrolling_row">
                                 <property name="visible">False</property>
                                 <property name="can_focus">True</property>
-                                <property name="no_show_all">True</property>
                                 <property name="activatable">false</property>
                                 <child>
                                   <object class="GtkGrid" id="edge_scrolling_grid">