diff --git a/far/changelog b/far/changelog
index 99ea9c56ed..8ebed9f6d5 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2025-01-21 20:58:50+00:00 - build 6420
+
+1. Make unquoting logic in "set" more cmd-like.
+
 --------------------------------------------------------------------------------
 drkns 2025-01-19 22:00:05+00:00 - build 6419
 
diff --git a/far/cmdline.cpp b/far/cmdline.cpp
index f4f4f9d245..369abc99ba 100644
--- a/far/cmdline.cpp
+++ b/far/cmdline.cpp
@@ -1163,8 +1163,20 @@ bool CommandLine::ProcessOSCommands(string_view const CmdLine, function_ref<void
 		if (FindKey(Arguments, L'A') || FindKey(Arguments, L'P'))
 			return false; //todo: /p - dialog, /a - calculation; then set variable ...
 
+		// cmd unquoting logic is rather weird, but when in Rome, do as the Romans do.
+		const auto set_unquote = [](string_view Str)
+		{
+			if (!Str.starts_with(L'"'))
+				return Str;
+
+			Str.remove_prefix(1);
+			inplace::trim_left(Str);
+
+			return Str.substr(0, Str.rfind(L'"'));
+		};
+
 		size_t pos;
-		const auto SetParams = unquote(trim_right(Arguments));
+		const auto SetParams = set_unquote(trim_right(Arguments));
 
 		// "set" (display all) or "set var" (display all that begin with "var")
 		if (SetParams.empty() || ((pos = SetParams.find(L'=')) == string::npos) || !pos)
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index 46c23265bd..d85043d639 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-6419
+6420