diff --git a/far/src/main.cpp b/far/src/main.cpp
index ed6b3b976..e5f860e29 100644
--- a/far/src/main.cpp
+++ b/far/src/main.cpp
@@ -714,8 +714,11 @@ int _cdecl main(int argc, char *argv[])
 
 		if (strcmp(name, "far2medit") == 0) { // run by symlink in editor mode
 			Opt.OnlyEditorViewerUsed = Options::ONLY_EDITOR;
-			if (argc > 1 && *argv[argc - 1] != '-')
-				Opt.strEditViewArg = argv[argc - 1];	// use last argument
+			if (argc > 1 && *argv[1] != '-') {
+				Opt.strEditViewArg = argv[1];	// use the next argument
+				--argc;
+				memmove(argv+1, argv+2, argc*sizeof(char*));
+			}
 		}
 		else if (strcmp(name, "far2m_askpass") == 0)
 			return sudo_main_askpass();
diff --git a/luafar/lua_share/far2/test/macrotest.lua b/luafar/lua_share/far2/test/macrotest.lua
index 9c0e67030..f49c9e388 100644
--- a/luafar/lua_share/far2/test/macrotest.lua
+++ b/luafar/lua_share/far2/test/macrotest.lua
@@ -1201,7 +1201,7 @@ local function test_XPanel(pan) -- (@pan: either APanel or PPanel)
   assert_eq   (pan.CurPos, assert_num(panInfo.CurrentItem))
   assert_eq   (pan.Current, assert_str(curItem.FileName))
   assert_num  (pan.DriveType)
-  assert_eq   (pan.Empty, panInfo.ItemsNumber==0)
+  assert_eq   (pan.Empty, panInfo.ItemsNumber==1) -- an empty panel has a ".." item
   assert_bool (pan.Eof)
   assert_eq   (pan.FilePanel, panInfo.PanelType==F.PTYPE_FILEPANEL)
   assert_bool (pan.Filter)