diff --git a/src/win/win_ui.c b/src/win/win_ui.c
index e5ab4958c..60d63b99e 100644
--- a/src/win/win_ui.c
+++ b/src/win/win_ui.c
@@ -1270,6 +1270,9 @@ ui_init(int nCmdShow)
     tdconfig.pButtons = tdbuttons;
     tdconfig.pfCallback = TaskDialogProcedure;
 
+    /* Load the desired iconset */
+    win_load_icon_set();
+
     /* Start settings-only mode if requested. */
     if (settings_only) {
 	if (! pc_init_modules()) {
@@ -1404,9 +1407,6 @@ ui_init(int nCmdShow)
     ResetAllMenus();
     media_menu_init();
 	
-    /* Load the desired iconset */
-    win_load_icon_set();
-
     /* Make the window visible on the screen. */
     ShowWindow(hwnd, nCmdShow);