diff --git a/main.c b/main.c
index 13c09b2..2d18b2f 100644
--- a/main.c
+++ b/main.c
@@ -175,12 +175,12 @@ int WINAPI _tWinMain (HINSTANCE hThisInstance,
         exit(1);
     }
 
-  UpdateRegistry(); /* Checks version change and update keys/values */
-
-  GetRegistryKeys();
   /* Parse command-line options */
   ProcessCommandLine(&o, GetCommandLine());
 
+  UpdateRegistry(); /* Checks version change and update keys/values */
+  GetRegistryKeys();
+
   EnsureDirExists(o.config_dir);
 
   if (!CheckVersion()) {