diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c47adf5b..77287236c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
+* Change Switch default config loading order of `HOME` and system (https://github.com/zellij-org/zellij/pull/488)
 
 ## [0.9.0] - 2021-05-11
 * Add more functionality to unbinding the default keybindings (https://github.com/zellij-org/zellij/pull/468)
diff --git a/src/common/setup.rs b/src/common/setup.rs
index eb3fdb8ee..37bf02da3 100644
--- a/src/common/setup.rs
+++ b/src/common/setup.rs
@@ -53,8 +53,8 @@ pub mod install {
 #[cfg(not(test))]
 pub fn find_default_config_dir() -> Option<PathBuf> {
     vec![
-        Some(xdg_config_dir()),
         home_config_dir(),
+        Some(xdg_config_dir()),
         Some(Path::new(SYSTEM_DEFAULT_CONFIG_DIR).to_path_buf()),
     ]
     .into_iter()