diff --git a/src/prompt_toolkit/completion/nested.py b/src/prompt_toolkit/completion/nested.py
index 8569bd2cf..b72b69ee2 100644
--- a/src/prompt_toolkit/completion/nested.py
+++ b/src/prompt_toolkit/completion/nested.py
@@ -69,7 +69,7 @@ def from_nested_dict(cls, data: NestedDict) -> NestedCompleter:
             elif isinstance(value, dict):
                 options[key] = cls.from_nested_dict(value)
             elif isinstance(value, set):
-                options[key] = cls.from_nested_dict({item: None for item in value})
+                options[key] = cls.from_nested_dict(dict.fromkeys(value))
             else:
                 assert value is None
                 options[key] = None
diff --git a/src/prompt_toolkit/formatted_text/utils.py b/src/prompt_toolkit/formatted_text/utils.py
index 43228c3cd..a6f78cb4e 100644
--- a/src/prompt_toolkit/formatted_text/utils.py
+++ b/src/prompt_toolkit/formatted_text/utils.py
@@ -89,8 +89,7 @@ def split_lines(
         parts = string.split("\n")
 
         for part in parts[:-1]:
-            if part:
-                line.append(cast(OneStyleAndTextTuple, (style, part, *mouse_handler)))
+            line.append(cast(OneStyleAndTextTuple, (style, part, *mouse_handler)))
             yield line
             line = []
 
diff --git a/tests/test_formatted_text.py b/tests/test_formatted_text.py
index 843aac161..60f9cdf45 100644
--- a/tests/test_formatted_text.py
+++ b/tests/test_formatted_text.py
@@ -274,7 +274,7 @@ def test_split_lines_3():
     lines = list(split_lines([("class:a", "\n")]))
 
     assert lines == [
-        [],
+        [("class:a", "")],
         [("class:a", "")],
     ]
 
@@ -284,3 +284,15 @@ def test_split_lines_3():
     assert lines == [
         [("class:a", "")],
     ]
+
+
+def test_split_lines_4():
+    "Edge cases: inputs starting and ending with newlines."
+    # -1-
+    lines = list(split_lines([("class:a", "\nline1\n")]))
+
+    assert lines == [
+        [("class:a", "")],
+        [("class:a", "line1")],
+        [("class:a", "")],
+    ]