diff --git a/src/lake/Lake/Toml/Data/Value.lean b/src/lake/Lake/Toml/Data/Value.lean
index beb973d6905a..fb0618837d69 100644
--- a/src/lake/Lake/Toml/Data/Value.lean
+++ b/src/lake/Lake/Toml/Data/Value.lean
@@ -104,22 +104,28 @@ end
 instance : ToString Value := ⟨Value.toString⟩
 
 def ppTable (t : Table) : String :=
-  String.trimLeft <| t.items.foldl (init := "") fun s (k,v) =>
+  let (ts, fs) := t.items.foldl (init := ("", "")) fun (ts, fs) (k,v) =>
     match v with
     | .array _ vs =>
       if vs.all (· matches .table ..) then
-        vs.foldl (init := s) fun s v =>
+        let fs := vs.foldl (init := fs) fun s v =>
           match v with
           | .table _ t =>
-            let s := s ++ s!"\n[[{ppKey k}]]\n"
-            t.items.foldl (fun s (k,v) => appendKeyval s k v) s
+            let s := s ++ s!"[[{ppKey k}]]\n"
+            let s := t.items.foldl (fun s (k,v) => appendKeyval s k v) s
+            s.push '\n'
           | _ => unreachable!
+        (ts, fs)
       else
-        s.append s!"{ppKey k} = {ppInlineArray vs}\n"
+        (ts.append s!"{ppKey k} = {ppInlineArray vs}\n", fs)
     | .table _ t =>
-      let s := s ++ s!"\n[{ppKey k}]\n"
-      t.items.foldl (fun s (k,v) => appendKeyval s k v) s
-    | _ => appendKeyval s k v
+      let fs := fs ++ s!"[{ppKey k}]\n"
+      let fs := t.items.foldl (fun s (k,v) => appendKeyval s k v) fs
+      (ts, fs.push '\n')
+    | _ => (appendKeyval ts k v, fs)
+  -- Ensures root table keys come before subtables
+  -- See https://github.com/leanprover/lean4/issues/4099
+  (ts.push '\n' ++ fs).trimRight.push '\n'
 where
   appendKeyval s k v :=
     s.append s!"{ppKey k} = {v}\n"
diff --git a/src/lake/tests/translateConfig/out.expected.toml b/src/lake/tests/translateConfig/out.expected.toml
index 89b532b4a7cb..6530167e9b1b 100644
--- a/src/lake/tests/translateConfig/out.expected.toml
+++ b/src/lake/tests/translateConfig/out.expected.toml
@@ -2,6 +2,9 @@ name = "test"
 testRunner = "b"
 defaultTargets = ["A"]
 
+[leanOptions]
+pp.unicode.fun = true
+
 [[require]]
 name = "foo"
 path = "dir"
diff --git a/src/lake/tests/translateConfig/source.lean b/src/lake/tests/translateConfig/source.lean
index 83c74f58c3c9..00fd81f309fc 100644
--- a/src/lake/tests/translateConfig/source.lean
+++ b/src/lake/tests/translateConfig/source.lean
@@ -29,7 +29,7 @@ package test where
   buildArchive? := none
   preferReleaseBuild := false
   packagesDir := defaultPackagesDir
-  toLeanConfig := testLeanConfig
+  leanOptions := #[⟨`pp.unicode.fun, true⟩]
 
 require foo from "dir" with NameMap.empty.insert `foo "bar"
 require bar from git "https://example.com" @ "abc" / "sub" / "dir"