diff --git a/panels/mouse/gnome-mouse-properties.c b/panels/mouse/gnome-mouse-properties.c
index 9fd8c1ad8..126b762e9 100644
--- a/panels/mouse/gnome-mouse-properties.c
+++ b/panels/mouse/gnome-mouse-properties.c
@@ -312,6 +312,20 @@ device_changed (GsdDeviceManager *device_manager,
 				show_touchpad_enabling_switch (d));
 }
 
+static void
+on_content_size_changed (GtkWidget     *widget,
+			  GtkAllocation *allocation,
+			  gpointer       data)
+{
+	if (allocation->height < 490) {
+		gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget),
+						GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+	} else {
+		gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget),
+						GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+		gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (widget), 490);
+	}
+}
 
 static void
 cc_mouse_properties_finalize (GObject *object)
@@ -380,6 +394,8 @@ cc_mouse_properties_init (CcMouseProperties *object)
 	gtk_container_add (GTK_CONTAINER (object), WID ("scrolled-window"));
 
 	setup_dialog (d);
+
+	g_signal_connect (WID ("scrolled-window"), "size-allocate", G_CALLBACK (on_content_size_changed), NULL);
 }
 
 GtkWidget *
diff --git a/panels/mouse/gnome-mouse-properties.ui b/panels/mouse/gnome-mouse-properties.ui
index a5c93d7e1..b62442c20 100644
--- a/panels/mouse/gnome-mouse-properties.ui
+++ b/panels/mouse/gnome-mouse-properties.ui
@@ -21,7 +21,6 @@
     <property name="can_focus">True</property>
     <property name="shadow_type">none</property>
     <property name="hscrollbar_policy">never</property>
-    <property name="max_content_height">440</property>
     <child>
       <object class="GtkBox" id="prefs_widget">
         <property name="visible">True</property>