diff --git a/far/changelog b/far/changelog
index 46a1f4ff02..cc38b74f4b 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+shmuel 27.05.2017 02:27:03 +0200 - build 4970
+
+1. Уточнение 4585: при переключении между панелью Фара и плагина (в любую сторону) не сохранялись
+   кастомные сортировки.
+
 drkns 26.05.2017 21:45:31 +0000 - build 4969
 
 1. Продолжение 4963.
diff --git a/far/filepanels.cpp b/far/filepanels.cpp
index 8fcac4a063..7e683d21bd 100644
--- a/far/filepanels.cpp
+++ b/far/filepanels.cpp
@@ -1012,8 +1012,7 @@ panel_ptr FilePanels::ChangePanel(panel_ptr Current, panel_type NewType, int Cre
 			NewPanel->SetPosition(X1,Y1,X2,Y2);
 		}
 
-		if (OldSortMode < panel_sort::COUNT)
-			NewPanel->SetSortMode(OldSortMode);
+		NewPanel->SetSortMode(OldSortMode);
 		NewPanel->SetSortOrder(OldSortOrder);
 		NewPanel->SetNumericSort(OldNumericSort);
 		NewPanel->SetCaseSensitiveSort(OldCaseSensitiveSort);
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index 0b12fb81ca..0449157956 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4969)m4_dnl
+m4_define(BUILD,4970)m4_dnl