diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c
index ce4e430ab..44deac431 100644
--- a/shell/gnome-control-center.c
+++ b/shell/gnome-control-center.c
@@ -483,12 +483,22 @@ search_entry_changed_cb (GtkEntry                  *entry,
   if (!g_strcmp0 (priv->filter_string, ""))
     {
       shell_show_overview_page (priv);
+      g_object_set (G_OBJECT (entry),
+                    "secondary-icon-name", "gtk-find",
+                    "secondary-icon-activatable", FALSE,
+                    "secondary-icon-sensitive", FALSE,
+                    NULL);
     }
   else
     {
       gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (priv->search_filter));
       gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook),
                                      SEARCH_PAGE);
+      g_object_set (G_OBJECT (entry),
+                          "secondary-icon-name", "gtk-clear",
+                          "secondary-icon-activatable", TRUE,
+                          "secondary-icon-sensitive", TRUE,
+                          NULL);
     }
 }
 
diff --git a/shell/shell.ui b/shell/shell.ui
index d4d3c6c4a..12e084439 100644
--- a/shell/shell.ui
+++ b/shell/shell.ui
@@ -46,10 +46,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="invisible_char">&#x25CF;</property>
-                            <property name="primary_icon_stock">gtk-find</property>
-                            <property name="secondary_icon_stock">gtk-clear</property>
-                            <property name="secondary_icon_activatable">True</property>
-                            <property name="secondary_icon_sensitive">True</property>
+                            <property name="secondary_icon_stock">gtk-find</property>
                           </object>
                         </child>
                       </object>