diff --git a/gtk/gtkcolumnviewrowwidget.c b/gtk/gtkcolumnviewrowwidget.c
index 8871ebcd0f..04991aeb91 100644
--- a/gtk/gtkcolumnviewrowwidget.c
+++ b/gtk/gtkcolumnviewrowwidget.c
@@ -254,7 +254,7 @@ gtk_column_view_row_widget_grab_focus (GtkWidget *widget)
 
   for (child = focus_child ? gtk_widget_get_next_sibling (focus_child) : gtk_widget_get_first_child (widget);
        child != focus_child;
-       child = gtk_widget_get_next_sibling (child))
+       child = child ? gtk_widget_get_next_sibling (child) : gtk_widget_get_first_child (widget))
     {
       /* When we started iterating at focus_child, we want to iterate over the rest
        * of the children, too */
diff --git a/gtk/gtklistfactorywidget.c b/gtk/gtklistfactorywidget.c
index 8e0197e6ee..684cefa3e6 100644
--- a/gtk/gtklistfactorywidget.c
+++ b/gtk/gtklistfactorywidget.c
@@ -65,7 +65,7 @@ gtk_list_factory_widget_activate_signal (GtkListFactoryWidget *self)
 {
   GtkListFactoryWidgetPrivate *priv = gtk_list_factory_widget_get_instance_private (self);
 
-  if (priv->activatable)
+  if (!priv->activatable)
     return;
 
   gtk_widget_activate_action (GTK_WIDGET (self),