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 9a1ae85984a2..7bc168856550 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
@@ -58,6 +58,7 @@ class DesktopLayout(private val idToInfo: MutableMap<String, WindowInfoImpl> = H
   }
 
   fun getInfo(id: String) = idToInfo.get(id)
+  fun getInfos() = idToInfo.toMap()
 
   internal fun addInfo(id: String, info: WindowInfoImpl) {
     val old = idToInfo.put(id, info)
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.kt
index 0540499afa4e..463bada9936b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.kt
@@ -95,7 +95,7 @@ open class ToolWindowManagerImpl @NonInjectable @TestOnly internal constructor(v
   private val state: ToolWindowManagerState
     get() = project.service()
 
-  private var layoutState
+  var layoutState
     get() = state.layout
     set(value) { state.layout = value }