diff --git a/shell/cc-shell-category-view.c b/shell/cc-shell-category-view.c
index d7094abce..41674479f 100644
--- a/shell/cc-shell-category-view.c
+++ b/shell/cc-shell-category-view.c
@@ -129,6 +129,7 @@ cc_shell_category_view_constructed (GObject *object)
   renderer = gtk_cell_renderer_pixbuf_new ();
   g_object_set (renderer,
                 "stock-size", GTK_ICON_SIZE_DIALOG,
+                "follow-state", TRUE,
                 NULL);
   gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (iconview),
                               renderer, FALSE);
diff --git a/shell/cc-window.c b/shell/cc-window.c
index 55ab0d939..6d9fd6b3a 100644
--- a/shell/cc-window.c
+++ b/shell/cc-window.c
@@ -782,6 +782,7 @@ setup_search (CcWindow *shell)
                 "xpad", 15,
                 "ypad", 10,
                 "stock-size", GTK_ICON_SIZE_DIALOG,
+                "follow-state", TRUE,
                 NULL);
   column = gtk_tree_view_column_new_with_attributes ("Icon", renderer,
                                                      "gicon", COL_GICON,