diff --git a/edkrepo/config/config_factory.py b/edkrepo/config/config_factory.py
index 7808704..9a4c193 100644
--- a/edkrepo/config/config_factory.py
+++ b/edkrepo/config/config_factory.py
@@ -26,6 +26,7 @@
 
 def get_edkrepo_global_data_directory():
     global_data_dir = None
+    user_data_dir = None
     if sys.platform == "win32":
         shell32 = oledll.shell32
         SHGetFolderPath = shell32.SHGetFolderPathW
@@ -36,11 +37,14 @@ def get_edkrepo_global_data_directory():
         common_appdata = create_unicode_buffer(MAX_PATH)
         SHGetFolderPath(None, CSIDL_COMMON_APPDATA, None, SHGFP_TYPE_CURRENT, common_appdata)
         global_data_dir = os.path.join(common_appdata.value, "edkrepo")
+        user_data_dir = os.path.expanduser(os.path.join("~", "edkrepo")) 
     elif sys.platform == "darwin" or sys.platform.startswith("linux") or os.name == "posix":
         global_data_dir = expanduser("~/.edkrepo")
     if not os.path.isdir(global_data_dir):
         if not os.path.exists(os.path.dirname(global_data_dir)):
             raise EdkrepoGlobalDataDirectoryNotFoundException(humble.GLOBAL_DATA_DIR_NOT_FOUND.format(os.path.dirname(global_data_dir)))
+        if sys.platform == "win32" and os.path.isdir(user_data_dir):
+            return user_data_dir
         os.mkdir(global_data_dir)
     return global_data_dir