diff --git a/src/cmd/cmd.go b/src/cmd/cmd.go
index 4f5e95febb..697ba1f772 100644
--- a/src/cmd/cmd.go
+++ b/src/cmd/cmd.go
@@ -16,7 +16,7 @@ var (
 	spicetifyFolder         = utils.GetSpicetifyFolder()
 	rawFolder, themedFolder = getExtractFolder()
 	backupFolder            = utils.GetStateFolder("Backup")
-	userThemesFolder        = utils.GetUserFolder("Themes")
+	userThemesFolder        = utils.GetSubFolder(spicetifyFolder, "Themes")
 	quiet                   bool
 	isAppX                  = false
 	spotifyPath             string
diff --git a/src/utils/path-utils.go b/src/utils/path-utils.go
index f070d6c00e..c158d66cea 100644
--- a/src/utils/path-utils.go
+++ b/src/utils/path-utils.go
@@ -92,20 +92,21 @@ func GetStateFolder(name string) string {
 
 		result = filepath.Join(parent, "spicetify")
 	}
-	return result
+
+	return GetSubFolder(result, name)
 }
 
-// getUserFolder checks if folder `name` is available in spicetifyFolder,
+// GetSubFolder checks if folder `name` is available in specified folder,
 // else creates then returns the path.
-func GetUserFolder(name string) string {
-	dir := filepath.Join(GetSpicetifyFolder(), name)
+func GetSubFolder(folder string, name string) string {
+	dir := filepath.Join(folder, name)
 	CheckExistAndCreate(dir)
 
 	return dir
 }
 
-var userAppsFolder = GetUserFolder("CustomApps")
-var userExtensionsFolder = GetUserFolder("Extensions")
+var userAppsFolder = GetSubFolder(GetSpicetifyFolder(), "CustomApps")
+var userExtensionsFolder = GetSubFolder(GetSpicetifyFolder(), "Extensions")
 
 func GetCustomAppSubfolderPath(folderPath string) string {
 	entries, err := os.ReadDir(folderPath)