diff --git a/.changelog/unreleased/bug-fixes/1368-base-directory-windows-local.md b/.changelog/unreleased/bug-fixes/1368-base-directory-windows-local.md
new file mode 100644
index 0000000000..05e48b5ba9
--- /dev/null
+++ b/.changelog/unreleased/bug-fixes/1368-base-directory-windows-local.md
@@ -0,0 +1,2 @@
+- Place the default data directory in the local rather than the roaming profile
+  on Windows. ([#1368](https://github.com/anoma/namada/pull/1368))
\ No newline at end of file
diff --git a/.changelog/unreleased/bug-fixes/1369-base-directory-organizations.md b/.changelog/unreleased/bug-fixes/1369-base-directory-organizations.md
new file mode 100644
index 0000000000..2095323047
--- /dev/null
+++ b/.changelog/unreleased/bug-fixes/1369-base-directory-organizations.md
@@ -0,0 +1,3 @@
+- Use blank qualifier and organization, and upcased Namada, to
+  construct default base directories on Mac and Windows platforms.
+  ([#1369](https://github.com/anoma/namada/pull/1369))
\ No newline at end of file
diff --git a/apps/src/lib/cli.rs b/apps/src/lib/cli.rs
index 591034b2e7..a86bfd259d 100644
--- a/apps/src/lib/cli.rs
+++ b/apps/src/lib/cli.rs
@@ -1817,9 +1817,10 @@ pub mod args {
                      configuration and state is stored. This value can also \
                      be set via `NAMADA_BASE_DIR` environment variable, but \
                      the argument takes precedence, if specified. Defaults to \
-                     `$HOME/.config/namada` or `$HOME/Library/Application\\ \
-                     Support/com.heliax.namada` depending on the operating \
-                     system (former is linux, latter is osx).",
+                     `$XDG_DATA_HOME/namada` (`$HOME/.local/share/namada` \
+                     where `XDG_DATA_HOME` is unset) on \
+                     Unix,`$HOME/Library/Application Support/Namada` on \
+                     Mac,and `%AppData%\\Namada` on Windows.",
                 ))
                 .arg(WASM_DIR.def().about(
                     "Directory with built WASM validity predicates, \
diff --git a/apps/src/lib/config/mod.rs b/apps/src/lib/config/mod.rs
index 239a17d7b5..2df988e298 100644
--- a/apps/src/lib/config/mod.rs
+++ b/apps/src/lib/config/mod.rs
@@ -378,8 +378,8 @@ impl Config {
 }
 
 pub fn get_default_namada_folder() -> PathBuf {
-    if let Some(project_dir) = ProjectDirs::from("com", "heliax", "namada") {
-        project_dir.data_dir().to_path_buf()
+    if let Some(project_dir) = ProjectDirs::from("", "", "Namada") {
+        project_dir.data_local_dir().to_path_buf()
     } else {
         DEFAULT_BASE_DIR.into()
     }