diff --git a/src/modules/conf_theme/e_int_config_xsettings.c b/src/modules/conf_theme/e_int_config_xsettings.c
index 7c6723d27..2f3c6ef70 100644
--- a/src/modules/conf_theme/e_int_config_xsettings.c
+++ b/src/modules/conf_theme/e_int_config_xsettings.c
@@ -273,11 +273,10 @@ _fill_files_ilist(void *data)
                      so val remains valid */
                   label = eina_stringshare_add(tmp);
                   e_widget_ilist_append(o, NULL, label, NULL, NULL, label /* val */);
+                  if ((e_config->xsettings.net_theme_name_detected == label) || (cfdata->widget_theme == label))
+                    e_widget_ilist_selected_set(cfdata->gui.widget_list, cnt);
                   eina_stringshare_del(label);
                   free(tmp);
-                  if (cfdata->widget_theme && !strcmp(cfdata->widget_theme, tmp))
-                    e_widget_ilist_selected_set(cfdata->gui.widget_list, cnt);
-
                   cnt++;
                }