diff --git a/src/dialog.c b/src/dialog.c
index 2d5a6d7b..9bab902c 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -182,8 +182,12 @@ static char *HistoryFileName(const char *name)
 {
 	char *filename = NULL;
 
-	filename = wstrdup(wusergnusteppath());
-	filename = wstrappend(filename, "/.AppInfo/WindowMaker/History");
+	filename = getenv("XDG_STATE_HOME");
+	if (filename)
+		filename = wstrappend(wexpandpath(filename), "/" PACKAGE_TARNAME "/History");
+	else
+		filename = wstrconcat(wusergnusteppath(), "/.AppInfo/" PACKAGE_TARNAME "/History");
+
 	if (name && strlen(name)) {
 		filename = wstrappend(filename, ".");
 		filename = wstrappend(filename, name);