diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c
index bb9feac3c6..c8f1513776 100644
--- a/libgimpwidgets/gimpicons.c
+++ b/libgimpwidgets/gimpicons.c
@@ -208,10 +208,6 @@ gimp_icons_set_icon_theme (GFile *path)
               g_object_unref (icon_theme_path);
               icon_theme_path = g_object_ref (path);
             }
-
-          g_object_set (gtk_settings_get_for_screen (gdk_screen_get_default ()),
-                        "gtk-icon-theme-name", icon_theme_name,
-                        NULL);
         }
       else
         {
@@ -219,6 +215,10 @@ gimp_icons_set_icon_theme (GFile *path)
           icon_theme_path = g_object_ref (path);
         }
 
+      g_object_set (gtk_settings_get_for_screen (gdk_screen_get_default ()),
+                    "gtk-icon-theme-name", icon_theme_name,
+                    NULL);
+
       success = TRUE;
     }