diff --git a/plugins/luamacro/_globalinfo.lua b/plugins/luamacro/_globalinfo.lua
index bf4dc8f03e..8d44f4fff9 100644
--- a/plugins/luamacro/_globalinfo.lua
+++ b/plugins/luamacro/_globalinfo.lua
@@ -1,6 +1,6 @@
 function export.GetGlobalInfo()
   return {
-    Version       = { 3, 0, 0, 847 },
+    Version       = { 3, 0, 0, 848 },
     MinFarVersion = { 3, 0, 0, 6327 },
     Guid          = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),
     Title         = "LuaMacro",
diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog
index 94674f782a..8c2be18c9e 100644
--- a/plugins/luamacro/changelog
+++ b/plugins/luamacro/changelog
@@ -1,3 +1,7 @@
+shmuel 2024-09-01 22:41:48+03:00 - build 848
+
+1. Macrobrowser: refactoring.
+
 shmuel 2024-08-17 10:06:48+03:00 - build 847
 
 1. LuaFAR:
diff --git a/plugins/luamacro/luafar/version.h b/plugins/luamacro/luafar/version.h
index 8bec18f69f..3fb557cf24 100644
--- a/plugins/luamacro/luafar/version.h
+++ b/plugins/luamacro/luafar/version.h
@@ -1,3 +1,3 @@
 #include <farversion.hpp>
 
-#define PLUGIN_BUILD 847
+#define PLUGIN_BUILD 848
diff --git a/plugins/luamacro/mbrowser.lua b/plugins/luamacro/mbrowser.lua
index b1bbd5cf73..ad7b082aa0 100644
--- a/plugins/luamacro/mbrowser.lua
+++ b/plugins/luamacro/mbrowser.lua
@@ -228,10 +228,13 @@ local CmpFuncs = {
                function (a,b) return LStricmp(a.description,b.description) > 0 end, "3↑", "3↓" },
 }
 
-local Data = mf.mload("LuaMacro", "MacroBrowser")
-local SortKey = Data and Data.SortKey or "C+F1"
-local InvSort = Data and Data.InvSort or 1
-local ShowOnlyActive = Data and Data.ShowOnlyActive
+local Data = mf.mload("LuaMacro", "MacroBrowser") or {}
+local SortKey = Data.SortKey
+local InvSort = Data.InvSort
+local ShowOnlyActive = Data.ShowOnlyActive
+
+if SortKey ~= "C+F1" and SortKey ~= "C+F2" and SortKey ~= "C+F3" then SortKey = "C+F1" end
+if InvSort ~= 1 and InvSort ~= 2 then InvSort = 1 end
 
 local function ShowHelp()
   far.Message(