1 files changed, 5 insertions, 3 deletions
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/DesktopLayout.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/DesktopLayout.kt
index f792e018efb8..f2cb37c1378c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/DesktopLayout.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/DesktopLayout.kt
@@ -140,11 +140,13 @@ class DesktopLayout(private val idToInfo: MutableMap<String, WindowInfoImpl> = H
       return null
     }
 
-    val state = Element(tagName)
+    var state: Element? = null
     for (info in getSortedList()) {
-      serialize(info)?.let {
-        state.addContent(it)
+      val child = serialize(info) ?: continue
+      if (state == null) {
+        state = Element(tagName)
       }
+      state.addContent(child)
     }
     return state
   }