diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index 8a0d3e9e3d..44799a008c 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -1900,7 +1900,7 @@ gtk_popover_buildable_add_child (GtkBuildable *buildable,
                                  const gchar  *type)
 {
   if (GTK_IS_WIDGET (child))
-    gtk_popover_set_child (GTK_POPOVER(buildable), GTK_WIDGET (child));
+    gtk_popover_set_child (GTK_POPOVER (buildable), GTK_WIDGET (child));
   else
     parent_buildable_iface->add_child (buildable, builder, child, type);
 }
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 95c728a4fe..38efd2aec4 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1878,10 +1878,10 @@ gtk_range_click_gesture_pressed (GtkGestureClick *gesture,
 
   mouse_location = gtk_widget_pick (widget, x, y, 0);
 
-  /* For the purposes of this function, we ignore fill and highlight and
-   * handle them like the trough */
-  if (mouse_location == priv->fill_widget ||
-      mouse_location == priv->highlight_widget)
+  /* For the purposes of this function, we treat anything outside
+   * the slider like a click on the trough
+   */
+  if (mouse_location != priv->slider_widget)
     mouse_location = priv->trough_widget;
 
   if (mouse_location == priv->slider_widget)