diff --git a/packages/ui/src/components/Component.svelte b/packages/ui/src/components/Component.svelte
index 595a296cfc..76e0244d92 100644
--- a/packages/ui/src/components/Component.svelte
+++ b/packages/ui/src/components/Component.svelte
@@ -25,20 +25,22 @@
   export let is: AnyComponent
   export let props = {}
 
-  $: component = getResource(is)
+  $: component = (is != null) ? getResource(is) : Promise.reject(new Error('is not defined'))
 </script>
 
-{#await component}
-  <Loading/>
-{:then Ctor}
-  <ErrorBoundary>
-    <Ctor {...props} on:change on:close on:open on:click>
-      <slot />
-    </Ctor>
-  </ErrorBoundary>
-{:catch err}
-  <pre style='max-height: 140px; overflow: auto;'>
-    <ErrorPresenter error={err}/>
-  </pre>
-  <!-- <Icon icon={ui.icon.Error} size="32" /> -->
-{/await}
+{#if is}
+  {#await component}
+    <Loading/>
+  {:then Ctor}
+    <ErrorBoundary>
+      <Ctor {...props} on:change on:close on:open on:click>
+        <slot />
+      </Ctor>
+    </ErrorBoundary>
+  {:catch err}
+    <pre style='max-height: 140px; overflow: auto;'>
+      <ErrorPresenter error={err}/>
+    </pre>
+    <!-- <Icon icon={ui.icon.Error} size="32" /> -->
+  {/await}
+{/if}
diff --git a/packages/ui/src/components/PanelInstance.svelte b/packages/ui/src/components/PanelInstance.svelte
index b38c4d321e..9c22c93be8 100644
--- a/packages/ui/src/components/PanelInstance.svelte
+++ b/packages/ui/src/components/PanelInstance.svelte
@@ -16,7 +16,7 @@
 <script lang="ts">
   import { getResource } from '@anticrm/platform'
   import { afterUpdate } from 'svelte'
-  import { Spinner } from '..'
+  import { AnySvelteComponent, Spinner } from '..'
   import { closePanel, PanelProps, panelstore as modal } from '../panelup'
   import { popupstore } from '../popups'
 
@@ -24,6 +24,8 @@
   let componentInstance: any
   let show: boolean = false
 
+  let component: AnySvelteComponent
+
   let props: PanelProps | undefined
   function _close () {
     closePanel()
@@ -31,6 +33,12 @@
 
   $: props = $modal.panel
 
+  $: if (props !== undefined) {
+    getResource(props.component).then((r) => {
+      component = r
+    })
+  }
+
   function escapeClose () {
     // Check if there is popup visible, then ignore
     if ($popupstore.length > 0) {
@@ -113,9 +121,9 @@
   }}
 />
 {#if props}
-  {#await getResource(props.component)}
+  {#if !component}
     <Spinner />
-  {:then component}
+  {:else}
     <div class="popup" bind:this={modalHTML} style={'z-index: 401'}>
       <svelte:component
         this={component}
@@ -128,7 +136,7 @@
       />
     </div>
     <div class="modal-overlay" class:show style={'z-index: 400'} on:click={() => escapeClose()} />
-  {/await}
+  {/if}
 {/if}
 
 <style lang="scss">
diff --git a/plugins/view-resources/src/components/EditDoc.svelte b/plugins/view-resources/src/components/EditDoc.svelte
index 8a59a46544..df9c0fe904 100644
--- a/plugins/view-resources/src/components/EditDoc.svelte
+++ b/plugins/view-resources/src/components/EditDoc.svelte
@@ -25,7 +25,7 @@
     getClient,
     KeyedAttribute
   } from '@anticrm/presentation'
-  import { AnyComponent, Component, Label } from '@anticrm/ui'
+  import { AnyComponent, Component, Label, Spinner } from '@anticrm/ui'
   import view from '@anticrm/view'
   import { createEventDispatcher } from 'svelte'
   import { getMixinStyle } from '../utils'
@@ -49,22 +49,20 @@
       object = result[0]
     })
 
-  $: if (object) objectClass = hierarchy.getClass(object._class)
+  $: if (object !== undefined) objectClass = hierarchy.getClass(object._class)
 
   let selectedClass: Ref<Class<Doc>> | undefined
   let prevSelected = selectedClass
 
   let keys: KeyedAttribute[] = []
   let collectionKeys: KeyedAttribute[] = []
+  let collectionEditors: AnyComponent[] = []
 
   let mixins: Mixin<Doc>[] = []
 
-  let selectedMixin: Mixin<Doc> | undefined
-
   $: if (object && prevSelected !== object._class) {
     prevSelected = object._class
     selectedClass = objectClass._id
-    selectedMixin = undefined
     parentClass = getParentClass(object._class)
     mixins = getMixins()
   }
@@ -128,10 +126,7 @@
 
   $: if (object) getEditorOrDefault(selectedClass, object._class)
 
-  async function getEditorOrDefault (
-    _class: Ref<Class<Doc>> | undefined,
-    defaultClass: Ref<Class<Doc>>
-  ): Promise<void> {
+  async function getEditorOrDefault (_class: Ref<Class<Doc>> | undefined, defaultClass: Ref<Class<Doc>>): Promise<void> {
     console.log('get editor or default')
     let editor = _class !== undefined ? await getEditor(_class) : undefined
     if (editor === undefined) {
@@ -184,6 +179,14 @@
     return result
   }
 
+  let title: string = ''
+
+  $: if (object !== undefined) {
+    getTitle(object).then((t) => {
+      title = t
+    })
+  }
+
   async function getTitle (object: Doc): Promise<string> {
     const name = (object as any).name
     if (name !== undefined) {
@@ -202,88 +205,106 @@
     if (editorMixin.editor != null) return editorMixin.editor
     if (clazz.extends != null) return getHeaderEditor(clazz.extends)
   }
+
+  let headerEditor: AnyComponent | undefined = undefined
+  let headerLoading = false
+  $: if (object !== undefined) {
+    headerLoading = true
+    getHeaderEditor(object._class).then((r) => {
+      headerEditor = r
+      headerLoading = false
+    })
+  }
+
+  async function updateCollectionEditors (keys: KeyedAttribute[]): Promise<void> {
+    const editors: AnyComponent[] = []
+    for (const k of keys) {
+      editors.push(await getCollectionEditor(k))
+    }
+    collectionEditors = editors
+  }
+
+  $: updateCollectionEditors(collectionKeys)
 </script>
 
-{#if object !== undefined}
-  {#await getTitle(object) then title}
-    <Panel
-      {icon}
-      {title}
-      {rightSection}
-      {fullSize}
-      {object}
-      on:close={() => {
-        dispatch('close')
-      }}
-    >
-      <div class="w-full" slot="subtitle">
-        {#await getHeaderEditor(object._class) then is}
-          {#if is}
-            <Component {is} props={{ object, keys }} />
-          {:else}
-            <AttributesBar {object} {keys} />
-          {/if}
-        {/await}
-      </div>
-      <div class="main-editor">
-        {#if mainEditor}
-          <Component
-            is={mainEditor}
-            props={{ object }}
-            on:open={(ev) => {
-              ignoreKeys = ev.detail.ignoreKeys
-              updateKeys()
-            }}
-            on:click={(ev) => {
-              fullSize = true
-              rightSection = ev.detail.presenter
-            }}
-          />
+{#if object !== undefined && title !== undefined}
+  <Panel
+    {icon}
+    {title}
+    {rightSection}
+    {fullSize}
+    {object}
+    on:close={() => {
+      dispatch('close')
+    }}
+  >
+    <div class="w-full" slot="subtitle">
+      {#if !headerLoading}
+        {#if headerEditor !== undefined}
+          <Component is={headerEditor} props={{ object, keys }} />
+        {:else}
+          <AttributesBar {object} {keys} />
         {/if}
-      </div>
-      {#if mixins.length > 0}
-        <div class="mixin-container">
+      {/if}
+    </div>
+    <div class="main-editor">
+      {#if mainEditor}
+        <Component
+          is={mainEditor}
+          props={{ object }}
+          on:open={(ev) => {
+            ignoreKeys = ev.detail.ignoreKeys
+            updateKeys()
+          }}
+          on:click={(ev) => {
+            fullSize = true
+            rightSection = ev.detail.presenter
+          }}
+        />
+      {/if}
+    </div>
+    {#if mixins.length > 0}
+      <div class="mixin-container">
+        <div
+          class="mixin-selector"
+          style={getMixinStyle(objectClass._id, selectedClass === objectClass._id)}
+          on:click={() => {
+            selectedClass = objectClass._id
+          }}
+        >
+          <Label label={objectClass.label} />
+        </div>
+        {#each mixins as mixin}
           <div
             class="mixin-selector"
-            style={getMixinStyle(objectClass._id, selectedClass === objectClass._id)}
+            style={getMixinStyle(mixin._id, selectedClass === mixin._id)}
             on:click={() => {
-              selectedClass = objectClass._id
-              selectedMixin = undefined
+              selectedClass = mixin._id
             }}
           >
-            <Label label={objectClass.label} />
+            <Label label={mixin.label} />
           </div>
-          {#each mixins as mixin}
-            <div
-              class="mixin-selector"
-              style={getMixinStyle(mixin._id, selectedClass === mixin._id)}
-              on:click={() => {
-                selectedClass = mixin._id
-                selectedMixin = mixin
-              }}
-            >
-              <Label label={mixin.label} />
-            </div>
-          {/each}
-        </div>
-      {/if}
-      {#each collectionKeys as collection}
+        {/each}
+      </div>
+    {/if}
+    {#if collectionKeys.length !== collectionEditors.length}
+      <Spinner />
+    {:else}
+      {#each collectionKeys as collection, i}
         <div class="mt-14">
-          {#await getCollectionEditor(collection) then is}
-            <Component
-              {is}
-              props={{
-                objectId: object._id,
-                _class: object._class,
-                space: object.space,
-                [collection.key]: getCollectionCounter(object, collection)
-              }}
-            />
-          {/await}
+          <Component
+            is={collectionEditors[i]}
+            props={{
+              objectId: object._id,
+              _class: object._class,
+              space: object.space,
+              [collection.key]: getCollectionCounter(object, collection)
+            }}
+          />
         </div>
       {/each}
-    </Panel>
-  {/await}
+    {/if}
+  </Panel>
 {/if}
 
 <style lang="scss">