diff --git a/models/presence/package.json b/models/presence/package.json
index 6eb2d0d6ad2..07051d9c01c 100644
--- a/models/presence/package.json
+++ b/models/presence/package.json
@@ -29,6 +29,7 @@
   },
   "dependencies": {
     "@hcengineering/core": "^0.6.32",
+    "@hcengineering/contact": "^0.6.24",
     "@hcengineering/model": "^0.6.11",
     "@hcengineering/model-core": "^0.6.0",
     "@hcengineering/model-presentation": "^0.6.0",
diff --git a/packages/presentation/src/components/DrawingBoardToolbar.svelte b/packages/presentation/src/components/DrawingBoardToolbar.svelte
index b6026ed1969..18dfa2dc190 100644
--- a/packages/presentation/src/components/DrawingBoardToolbar.svelte
+++ b/packages/presentation/src/components/DrawingBoardToolbar.svelte
@@ -1,5 +1,5 @@
 <!--
-// Copyright © 2024 Hardcore Engineering Inc.
+// Copyright © 2024-2025 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -224,6 +224,7 @@
       bind:value={penWidth}
       on:change={updatePenWidth}
     />
+    <div class="divider buttons-divider" />
   {:else if tool === 'erase'}
     <input
       class="widthSelector"
@@ -234,6 +235,7 @@
       bind:value={eraserWidth}
       on:change={updateEraserWidth}
     />
+    <div class="divider buttons-divider" />
   {:else if tool === 'text'}
     <input
       class="widthSelector"
@@ -244,8 +246,8 @@
       bind:value={fontSize}
       on:change={updateFontSize}
     />
+    <div class="divider buttons-divider" />
   {/if}
-  <div class="divider buttons-divider" />
   {#each penColors as color}
     <Button
       kind="icon"
diff --git a/packages/presentation/src/drawing.ts b/packages/presentation/src/drawing.ts
index f5c2a1dabec..1df869f1709 100644
--- a/packages/presentation/src/drawing.ts
+++ b/packages/presentation/src/drawing.ts
@@ -1,5 +1,5 @@
 //
-// Copyright © 2024 Hardcore Engineering Inc.
+// Copyright © 2024-2025 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -12,9 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+
 export interface DrawingData {
   content?: string
 }
+
 export interface DrawingProps {
   readonly: boolean
   autoSize?: boolean
@@ -29,12 +31,17 @@ export interface DrawingProps {
   fontSize?: number
   defaultCursor?: string
   changingCmdId?: string
+  personCursorPos?: Point
+  personCursorVisible?: boolean
   cmdAdded?: (cmd: DrawingCmd) => void
   cmdChanging?: (id: string) => void
   cmdUnchanged?: (id: string) => void
   cmdChanged?: (cmd: DrawingCmd) => void
   cmdDeleted?: (id: string) => void
   editorCreated?: (editor: HTMLDivElement) => void
+  pointerMoved?: (canvasPos: Point) => void
+  personCursorMoved?: (nodePos: Point) => void
+  panning?: (offset: Point) => void
   panned?: (offset: Point) => void
 }
 
@@ -60,7 +67,7 @@ export interface DrawLineCmd extends DrawingCmd {
 
 export type DrawingTool = 'pen' | 'erase' | 'pan' | 'text'
 
-interface Point {
+export interface Point {
   x: number
   y: number
 }
@@ -75,6 +82,10 @@ export const makeCommandId = (): string => {
   return crypto.randomUUID().toString()
 }
 
+function easeInOutCubic (x: number): number {
+  return x < 0.5 ? 4 * x * x * x : 1 - Math.pow(-2 * x + 2, 3) / 2
+}
+
 const crossSvg = `<svg height="8" width="8" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
   <path d="m1.29 2.71 5.3 5.29-5.3 5.29c-.92.92.49 2.34 1.41 1.41l5.3-5.29 5.29 5.3c.92.92 2.34-.49 1.41-1.41l-5.29-5.3 5.3-5.29c.92-.93-.49-2.34-1.42-1.42l-5.29 5.3-5.29-5.3c-.93-.92-2.34.49-1.42 1.42z"/>
 </svg>`
@@ -112,15 +123,15 @@ class DrawState {
 
   mouseToCanvasPoint = (mouse: Point): Point => {
     return {
-      x: mouse.x * this.scale.x - this.offset.x - this.center.x,
-      y: mouse.y * this.scale.y - this.offset.y - this.center.y
+      x: Math.round(mouse.x * this.scale.x - this.offset.x - this.center.x),
+      y: Math.round(mouse.y * this.scale.y - this.offset.y - this.center.y)
     }
   }
 
   canvasToMousePoint = (canvas: Point): Point => {
     return {
-      x: canvas.x / this.scale.x + this.offset.x + this.center.x,
-      y: canvas.y / this.scale.y + this.offset.y + this.center.y
+      x: Math.round(canvas.x / this.scale.x + this.offset.x + this.center.x),
+      y: Math.round(canvas.y / this.scale.y + this.offset.y + this.center.y)
     }
   }
 
@@ -277,19 +288,21 @@ export function drawing (
     return {}
   }
 
-  const canvasCursor = document.createElement('div')
-  canvasCursor.style.visibility = 'hidden'
-  canvasCursor.style.position = 'absolute'
-  canvasCursor.style.borderRadius = '50%'
-  canvasCursor.style.border = 'none'
-  canvasCursor.style.cursor = 'none'
-  canvasCursor.style.pointerEvents = 'none'
-  canvasCursor.style.left = '50%'
-  canvasCursor.style.top = '50%'
-  node.appendChild(canvasCursor)
+  const toolCursor = document.createElement('div')
+  toolCursor.style.visibility = 'hidden'
+  toolCursor.style.position = 'absolute'
+  toolCursor.style.borderRadius = '50%'
+  toolCursor.style.border = 'none'
+  toolCursor.style.cursor = 'none'
+  toolCursor.style.pointerEvents = 'none'
+  toolCursor.style.left = '50%'
+  toolCursor.style.top = '50%'
+  node.appendChild(toolCursor)
 
   let readonly = props.readonly ?? false
   let prevPos: Point = { x: 0, y: 0 }
+  let personCursorPos: Point = { x: 0, y: 0 }
+  let isPersonCursorAnimating = false
 
   const draw = new DrawState(ctx)
   draw.tool = props.tool ?? draw.tool
@@ -298,8 +311,9 @@ export function drawing (
   draw.eraserWidth = props.eraserWidth ?? draw.eraserWidth
   draw.fontSize = props.fontSize ?? draw.fontSize
   draw.offset = props.offset ?? draw.offset
+  let isOffsetAnimating = false
 
-  updateCanvasCursor()
+  updateToolCursor()
   updateCanvasTouchAction()
 
   interface LiveTextBox {
@@ -348,13 +362,16 @@ export function drawing (
   function touchToNodePoint (touch: Touch, node: HTMLElement): Point {
     const rect = node.getBoundingClientRect()
     return {
-      x: touch.clientX - rect.left,
-      y: touch.clientY - rect.top
+      x: Math.round(touch.clientX - rect.left),
+      y: Math.round(touch.clientY - rect.top)
     }
   }
 
   function pointerToNodePoint (e: PointerEvent): Point {
-    return { x: e.offsetX, y: e.offsetY }
+    return {
+      x: Math.round(e.offsetX),
+      y: Math.round(e.offsetY)
+    }
   }
 
   canvas.ontouchstart = (e) => {
@@ -422,13 +439,13 @@ export function drawing (
 
   canvas.onpointerenter = () => {
     if (!readonly && draw.isDrawingTool()) {
-      canvasCursor.style.visibility = 'visible'
+      toolCursor.style.visibility = 'visible'
     }
   }
 
   canvas.onpointerleave = () => {
     if (!readonly && draw.isDrawingTool()) {
-      canvasCursor.style.visibility = 'hidden'
+      toolCursor.style.visibility = 'hidden'
     }
   }
 
@@ -444,14 +461,13 @@ export function drawing (
   function drawContinue (p: Point): void {
     if (draw.isDrawingTool()) {
       const w = draw.cursorWidth()
-      canvasCursor.style.left = `${p.x - w / 2}px`
-      canvasCursor.style.top = `${p.y - w / 2}px`
+      toolCursor.style.left = `${p.x - w / 2}px`
+      toolCursor.style.top = `${p.y - w / 2}px`
       if (draw.on) {
-        if (Math.hypot(prevPos.x - p.x, prevPos.y - p.y) < draw.minLineLength) {
-          return
+        if (Math.hypot(prevPos.x - p.x, prevPos.y - p.y) >= draw.minLineLength) {
+          draw.drawLive(p.x, p.y)
+          prevPos = p
         }
-        draw.drawLive(p.x, p.y)
-        prevPos = p
       }
     }
 
@@ -461,12 +477,19 @@ export function drawing (
         draw.offset.y += p.y - prevPos.y
         replayCommands()
         prevPos = p
+        if (props.panning !== undefined) {
+          props.panning(draw.offset)
+        }
       })
     }
 
     if (draw.on && draw.tool === 'text') {
       prevPos = p
     }
+
+    if (props.pointerMoved !== undefined) {
+      props.pointerMoved(draw.mouseToCanvasPoint(p))
+    }
   }
 
   function drawEnd (p: Point): void {
@@ -800,31 +823,106 @@ export function drawing (
     }
   }
 
-  function updateCanvasCursor (): void {
+  function updateToolCursor (): void {
     if (readonly) {
-      canvasCursor.style.visibility = 'hidden'
+      toolCursor.style.visibility = 'hidden'
       canvas.style.cursor = props.defaultCursor ?? 'default'
     } else if (draw.isDrawingTool()) {
       canvas.style.cursor = 'none'
-      canvasCursor.style.visibility = 'visible'
+      toolCursor.style.visibility = 'visible'
       const erasing = draw.tool === 'erase'
       const w = draw.cursorWidth()
-      canvasCursor.style.background = erasing ? 'none' : draw.penColor
-      canvasCursor.style.boxShadow = erasing
+      toolCursor.style.background = erasing ? 'none' : draw.penColor
+      toolCursor.style.boxShadow = erasing
         ? '0px 0px 1px 1px white inset, 0px 0px 2px 1px black'
         : '0px 0px 3px 0px var(--theme-button-contrast-enabled)'
-      canvasCursor.style.width = `${w}px`
-      canvasCursor.style.height = `${w}px`
+      toolCursor.style.width = `${w}px`
+      toolCursor.style.height = `${w}px`
     } else if (draw.tool === 'pan') {
       canvas.style.cursor = 'move'
-      canvasCursor.style.visibility = 'hidden'
+      toolCursor.style.visibility = 'hidden'
     } else if (draw.tool === 'text') {
       canvas.style.cursor = 'text'
-      canvasCursor.style.visibility = 'hidden'
+      toolCursor.style.visibility = 'hidden'
     } else {
       canvas.style.cursor = 'default'
-      canvasCursor.style.visibility = 'hidden'
+      toolCursor.style.visibility = 'hidden'
+    }
+  }
+
+  let personCursorPosNext: Point | undefined
+
+  function updatePersonCursor (newPos?: Point): void {
+    if (props.personCursorMoved === undefined) {
+      return
+    }
+
+    // Repaint person cursor in the same canvas position but with different offset
+    // The happen when we receive a new offset because of panning
+    if (newPos === undefined) {
+      const p = draw.canvasToMousePoint(personCursorPos)
+      const x = Math.max(0, Math.min(p.x, canvas.width))
+      const y = Math.max(0, Math.min(p.y, canvas.height))
+      props.personCursorMoved({ x, y })
+      return
+    }
+
+    if (isPersonCursorAnimating) {
+      personCursorPosNext = newPos
+      return
+    }
+
+    // This happens when we receive a new cursor position via subscription
+    // Subscription events happen happen rarely, and if we'd just update the cursor position
+    // it'd moved with big steps which looks ugly. So we smooth the movement
+    // (Ideally, it'd be cool to interpolate curved movement the same as we interpolate line drawing)
+    // Animation duration should be the same as myDataThrottleInterval in the Presence client
+    const targetFps = 60
+    const frameInterval = 1000 / targetFps
+    const animDuration = 100
+    const oldPos = personCursorPos
+    const distanceX = newPos.x - oldPos.x
+    const distanceY = newPos.y - oldPos.y
+    let lastTime = 0
+    let startTime = 0
+    const animate = (currentTime: number): void => {
+      if (lastTime === 0) {
+        lastTime = currentTime
+        startTime = currentTime
+        requestAnimationFrame(animate)
+        return
+      }
+      const deltaTime = currentTime - lastTime
+      if (deltaTime > frameInterval) {
+        lastTime = currentTime - (deltaTime % frameInterval)
+        const frac = Math.min((lastTime - startTime) / animDuration, 1)
+        personCursorPos = {
+          x: Math.round(oldPos.x + distanceX * frac),
+          y: Math.round(oldPos.y + distanceY * frac)
+        }
+        if (props.personCursorMoved !== undefined) {
+          const p = draw.canvasToMousePoint(personCursorPos)
+          const x = Math.max(0, Math.min(p.x, canvas.width))
+          const y = Math.max(0, Math.min(p.y, canvas.height))
+          props.personCursorMoved({ x, y })
+        }
+        if (frac >= 1) {
+          isPersonCursorAnimating = false
+
+          if (personCursorPosNext !== undefined) {
+            setTimeout(() => {
+              const nextPos = personCursorPosNext
+              personCursorPosNext = undefined
+              updatePersonCursor(nextPos)
+            }, 0)
+          }
+          return
+        }
+      }
+      requestAnimationFrame(animate)
     }
+    isPersonCursorAnimating = true
+    requestAnimationFrame(animate)
   }
 
   function updateCanvasTouchAction (): void {
@@ -845,42 +943,71 @@ export function drawing (
     canvas,
 
     update (props: DrawingProps) {
+      let offsetDelta: Point | undefined
       let replay = false
-      if (props.offset !== undefined && (props.offset.x !== draw.offset.x || props.offset.y !== draw.offset.y)) {
-        draw.offset = props.offset
-        replay = true
-      }
-      if (commands !== props.commands) {
-        commands = props.commands
-        replay = true
-      }
-      let updateCursor = false
-      let updateTextBox = false
-      if (draw.tool !== props.tool) {
-        draw.tool = props.tool ?? 'pen'
-        updateCursor = true
-      }
-      if (draw.penColor !== props.penColor) {
-        draw.penColor = props.penColor ?? 'blue'
-        updateTextBox = true
-        updateCursor = true
-      }
-      if (draw.penWidth !== props.penWidth) {
-        draw.penWidth = props.penWidth ?? draw.penWidth
-        updateCursor = true
-      }
-      if (draw.eraserWidth !== props.eraserWidth) {
-        draw.eraserWidth = props.eraserWidth ?? draw.eraserWidth
-        updateCursor = true
-      }
-      if (draw.fontSize !== props.fontSize) {
-        draw.fontSize = props.fontSize ?? draw.fontSize
-        updateTextBox = true
-      }
-      if (props.readonly !== readonly) {
-        readonly = props.readonly ?? false
-        updateCanvasTouchAction()
-        updateCursor = true
+      let syncToolCursor = false
+      let syncPersonCursor: Point | undefined
+      let syncLiveTextBox = false
+      if (props.offset !== undefined && !isOffsetAnimating) {
+        const deltaX = props.offset.x - draw.offset.x
+        const deltaY = props.offset.y - draw.offset.y
+        if (deltaX !== 0 || deltaY !== 0) {
+          if (Math.hypot(deltaX, deltaY) > 20) {
+            offsetDelta = { x: deltaX, y: deltaY }
+          } else {
+            draw.offset = props.offset
+          }
+          replay = true
+        }
+      }
+      if (props.commands !== undefined) {
+        if (commands !== props.commands) {
+          commands = props.commands
+          replay = true
+        }
+      }
+      if (props.tool !== undefined) {
+        if (draw.tool !== props.tool) {
+          draw.tool = props.tool
+          syncToolCursor = true
+        }
+      }
+      if (props.penColor !== undefined) {
+        if (draw.penColor !== props.penColor) {
+          draw.penColor = props.penColor
+          syncLiveTextBox = true
+          syncToolCursor = true
+        }
+      }
+      if (props.penWidth !== undefined) {
+        if (draw.penWidth !== props.penWidth) {
+          draw.penWidth = props.penWidth
+          syncToolCursor = true
+        }
+      }
+      if (props.eraserWidth !== undefined) {
+        if (draw.eraserWidth !== props.eraserWidth) {
+          draw.eraserWidth = props.eraserWidth
+          syncToolCursor = true
+        }
+      }
+      if (props.fontSize !== undefined) {
+        if (draw.fontSize !== props.fontSize) {
+          draw.fontSize = props.fontSize
+          syncLiveTextBox = true
+        }
+      }
+      if (props.readonly !== undefined) {
+        if (props.readonly !== readonly) {
+          readonly = props.readonly
+          updateCanvasTouchAction()
+          syncToolCursor = true
+        }
+      }
+      if (props.personCursorPos !== undefined) {
+        if (props.personCursorPos.x !== personCursorPos.x || props.personCursorPos.y !== personCursorPos.y) {
+          syncPersonCursor = props.personCursorPos
+        }
       }
       if (props.changingCmdId === undefined) {
         if (liveTextBox !== undefined) {
@@ -898,14 +1025,55 @@ export function drawing (
           replay = true
         }
       }
-      if (updateCursor) {
-        updateCanvasCursor()
+      if (syncToolCursor) {
+        updateToolCursor()
+      }
+      if (syncPersonCursor !== undefined) {
+        updatePersonCursor(syncPersonCursor)
       }
-      if (updateTextBox) {
+      if (syncLiveTextBox) {
         updateLiveTextBox()
       }
       if (replay) {
-        replayCommands()
+        if (offsetDelta !== undefined) {
+          const distance = offsetDelta
+          const targetFps = 60
+          const frameInterval = 1000 / targetFps
+          const animDuration = 500
+          const oldOffset = draw.offset
+          let lastTime = 0
+          let startTime = 0
+          const animate = (currentTime: number): void => {
+            if (lastTime === 0) {
+              lastTime = currentTime
+              startTime = currentTime
+              requestAnimationFrame(animate)
+              return
+            }
+            const deltaTime = currentTime - lastTime
+            if (deltaTime > frameInterval) {
+              lastTime = currentTime - (deltaTime % frameInterval)
+              const fracTime = Math.min((lastTime - startTime) / animDuration, 1)
+              const fracDist = easeInOutCubic(fracTime)
+              draw.offset = {
+                x: Math.round(oldOffset.x + distance.x * fracDist),
+                y: Math.round(oldOffset.y + distance.y * fracDist)
+              }
+              replayCommands()
+              updatePersonCursor()
+              if (fracTime >= 1) {
+                isOffsetAnimating = false
+                return
+              }
+            }
+            requestAnimationFrame(animate)
+          }
+          isOffsetAnimating = true
+          requestAnimationFrame(animate)
+        } else {
+          replayCommands()
+          updatePersonCursor()
+        }
       }
     }
   }
diff --git a/plugins/presence-resources/src/client.ts b/plugins/presence-resources/src/client.ts
index 15db37f8226..98a82e01a72 100644
--- a/plugins/presence-resources/src/client.ts
+++ b/plugins/presence-resources/src/client.ts
@@ -1,5 +1,5 @@
 //
-// Copyright © 2024 Hardcore Engineering Inc.
+// Copyright © 2024-2025 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -20,16 +20,25 @@ import presence from '@hcengineering/presence'
 import presentation from '@hcengineering/presentation'
 import { type Unsubscriber, get } from 'svelte/store'
 
-import { myPresence, onPersonUpdate, onPersonLeave } from './store'
-import { type RoomPresence } from './types'
+import { myPresence, myData, isAnybodyInMyRoom, onPersonUpdate, onPersonLeave, onPersonData } from './store'
+import type { RoomPresence, MyDataItem } from './types'
 
-interface Message {
+interface PresenceMessage {
   id: Ref<Person>
   type: 'update' | 'remove'
   presence?: RoomPresence[]
   lastUpdate?: number
 }
 
+interface DataMessage {
+  type: 'data'
+  sender: Ref<Person>
+  topic: string
+  data: any
+}
+
+type IncomingMessage = PresenceMessage | DataMessage
+
 export class PresenceClient implements Disposable {
   private ws: WebSocket | null = null
   private closed = false
@@ -39,15 +48,21 @@ export class PresenceClient implements Disposable {
   private readonly RECONNECT_INTERVAL = 1000
   private readonly PING_INTERVAL = 30 * 1000
   private readonly PING_TIMEOUT = 5 * 60 * 1000
+  private readonly myDataThrottleInterval = 100
 
   private presence: RoomPresence[]
+  private readonly myDataTimestamps = new Map<string, number>()
   private readonly myPresenceUnsub: Unsubscriber
+  private readonly myDataUnsub: Unsubscriber
 
   constructor (private readonly url: string | URL) {
     this.presence = get(myPresence)
     this.myPresenceUnsub = myPresence.subscribe((presence) => {
       this.handlePresenceChanged(presence)
     })
+    this.myDataUnsub = myData.subscribe((data) => {
+      this.handleMyDataChanged(data, false)
+    })
 
     this.connect()
   }
@@ -58,6 +73,7 @@ export class PresenceClient implements Disposable {
     this.stopPing()
 
     this.myPresenceUnsub()
+    this.myDataUnsub()
 
     if (this.ws !== null) {
       this.ws.close()
@@ -146,15 +162,18 @@ export class PresenceClient implements Disposable {
   private handleConnect (): void {
     this.sendPresence(getCurrentEmployee(), this.presence)
     this.startPing()
+    this.handleMyDataChanged(get(myData), true)
   }
 
   private handleMessage (data: string): void {
     try {
-      const message = JSON.parse(data) as Message
+      const message = JSON.parse(data) as IncomingMessage
       if (message.type === 'update' && message.presence !== undefined) {
         onPersonUpdate(message.id, message.presence ?? [])
       } else if (message.type === 'remove') {
         onPersonLeave(message.id)
+      } else if (message.type === 'data') {
+        onPersonData(message.sender, message.topic, message.data)
       } else {
         console.warn('Unknown message type', message)
       }
@@ -166,15 +185,37 @@ export class PresenceClient implements Disposable {
   private handlePresenceChanged (presence: RoomPresence[]): void {
     this.presence = presence
     this.sendPresence(getCurrentEmployee(), this.presence)
+    this.handleMyDataChanged(get(myData), true)
   }
 
   private sendPresence (person: Ref<Person>, presence: RoomPresence[]): void {
     if (!this.closed && this.ws !== null && this.ws.readyState === WebSocket.OPEN) {
-      const message: Message = { id: person, type: 'update', presence }
+      const message: PresenceMessage = { id: person, type: 'update', presence }
       this.ws.send(JSON.stringify(message))
     }
   }
 
+  private handleMyDataChanged (data: Map<string, MyDataItem>, forceSend: boolean): void {
+    if (!isAnybodyInMyRoom()) {
+      return
+    }
+    if (!this.closed && this.ws !== null && this.ws.readyState === WebSocket.OPEN) {
+      for (const [topic, value] of data) {
+        const lastSend = this.myDataTimestamps.get(topic) ?? 0
+        if (value.lastUpdated >= lastSend + this.myDataThrottleInterval || forceSend) {
+          this.myDataTimestamps.set(topic, value.lastUpdated)
+          const message: DataMessage = {
+            sender: getCurrentEmployee(),
+            type: 'data',
+            topic,
+            data: value.data
+          }
+          this.ws.send(JSON.stringify(message))
+        }
+      }
+    }
+  }
+
   [Symbol.dispose] (): void {
     this.close()
   }
diff --git a/plugins/presence-resources/src/components/Presence.svelte b/plugins/presence-resources/src/components/Presence.svelte
index 3d3b52d1831..a1f840aa950 100644
--- a/plugins/presence-resources/src/components/Presence.svelte
+++ b/plugins/presence-resources/src/components/Presence.svelte
@@ -1,5 +1,5 @@
 <!--
-// Copyright © 2020 Anticrm Platform Contributors.
+// Copyright © 2024 Anticrm Platform Contributors.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
diff --git a/plugins/presence-resources/src/components/PresenceAvatars.svelte b/plugins/presence-resources/src/components/PresenceAvatars.svelte
index 65bd25d1a54..03d95f676ac 100644
--- a/plugins/presence-resources/src/components/PresenceAvatars.svelte
+++ b/plugins/presence-resources/src/components/PresenceAvatars.svelte
@@ -1,5 +1,5 @@
 <!--
-// Copyright © 2020 Anticrm Platform Contributors.
+// Copyright © 2024-2025 Anticrm Platform Contributors.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -20,7 +20,7 @@
   import { getEmbeddedLabel } from '@hcengineering/platform'
   import { IconSize, tooltip, deviceOptionsStore as deviceInfo, checkAdaptiveMatching } from '@hcengineering/ui'
   import PresenceList from './PresenceList.svelte'
-  import { presenceByObjectId } from '../store'
+  import { presenceByObjectId, followee, toggleFollowee } from '../store'
 
   export let object: Doc
 
@@ -54,10 +54,31 @@
   {:else}
     <div class="flex-row-center flex-gap-1">
       {#each persons as person}
-        <div use:tooltip={{ label: getEmbeddedLabel(formatName(person.name)) }}>
+        <!-- svelte-ignore a11y-click-events-have-key-events -->
+        <!-- svelte-ignore a11y-no-static-element-interactions -->
+        <div
+          use:tooltip={{ label: getEmbeddedLabel(formatName(person.name)) }}
+          class="avatar-button"
+          class:followee-avatar={$followee === person._id}
+          on:click={() => {
+            toggleFollowee(person._id)
+          }}
+        >
           <Avatar name={person.name} {size} {person} />
         </div>
       {/each}
     </div>
   {/if}
 {/if}
+
+<style lang="scss">
+  .avatar-button {
+    cursor: pointer;
+  }
+
+  .followee-avatar {
+    border-radius: 20%;
+    outline: 2px solid var(--primary-button-default);
+    outline-offset: 1px;
+  }
+</style>
diff --git a/plugins/presence-resources/src/components/PresenceContext.svelte b/plugins/presence-resources/src/components/PresenceContext.svelte
index e46985ce17a..c288232756c 100644
--- a/plugins/presence-resources/src/components/PresenceContext.svelte
+++ b/plugins/presence-resources/src/components/PresenceContext.svelte
@@ -1,5 +1,5 @@
 <!--
-// Copyright © 2020 Anticrm Platform Contributors.
+// Copyright © 2024 Anticrm Platform Contributors.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
diff --git a/plugins/presence-resources/src/components/PresenceList.svelte b/plugins/presence-resources/src/components/PresenceList.svelte
index 21a4c75c35b..d0e68ed2f6f 100644
--- a/plugins/presence-resources/src/components/PresenceList.svelte
+++ b/plugins/presence-resources/src/components/PresenceList.svelte
@@ -1,5 +1,5 @@
 <!--
-// Copyright © 2024 Hardcore Engineering Inc.
+// Copyright © 2024-2025 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -16,6 +16,7 @@
   import { Person, formatName } from '@hcengineering/contact'
   import { Avatar } from '@hcengineering/contact-resources'
   import { IconSize, Scroller } from '@hcengineering/ui'
+  import { followee, toggleFollowee } from '../store'
 
   export let persons: Person[]
   export let size: IconSize
@@ -23,11 +24,30 @@
 
 <Scroller padding={'.25rem'} gap={'flex-gap-2'}>
   {#each persons as person}
-    <div class="flex-row-center flex-no-shrink flex-gap-2">
-      <div class="min-w-6">
+    <!-- svelte-ignore a11y-click-events-have-key-events -->
+    <!-- svelte-ignore a11y-no-static-element-interactions -->
+    <div
+      class="flex-row-center flex-no-shrink flex-gap-2 avatar-button"
+      on:click={() => {
+        toggleFollowee(person._id)
+      }}
+    >
+      <div class="min-w-6" class:followee-avatar={$followee === person._id}>
         <Avatar name={person.name} {size} {person} />
       </div>
       {formatName(person.name)}
     </div>
   {/each}
 </Scroller>
+
+<style lang="scss">
+  .avatar-button {
+    cursor: pointer;
+  }
+
+  .followee-avatar {
+    border-radius: 20%;
+    outline: 2px solid var(--primary-button-default);
+    outline-offset: 1px;
+  }
+</style>
diff --git a/plugins/presence-resources/src/components/WorkbenchExtension.svelte b/plugins/presence-resources/src/components/WorkbenchExtension.svelte
index 1e93be67ae3..715edc2aa9a 100644
--- a/plugins/presence-resources/src/components/WorkbenchExtension.svelte
+++ b/plugins/presence-resources/src/components/WorkbenchExtension.svelte
@@ -1,3 +1,18 @@
+<!--
+// Copyright © 2024 Anticrm Platform Contributors.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+
 <script lang="ts">
   import { onDestroy, onMount } from 'svelte'
 
diff --git a/plugins/presence-resources/src/index.ts b/plugins/presence-resources/src/index.ts
index 36267812821..59c0248ae94 100644
--- a/plugins/presence-resources/src/index.ts
+++ b/plugins/presence-resources/src/index.ts
@@ -1,5 +1,5 @@
 //
-// Copyright © 2024 Hardcore Engineering Inc.
+// Copyright © 2024-2025 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -18,6 +18,7 @@ import { type Resources } from '@hcengineering/platform'
 import Presence from './components/Presence.svelte'
 import PresenceAvatars from './components/PresenceAvatars.svelte'
 import WorkbenchExtension from './components/WorkbenchExtension.svelte'
+import { getFollowee, publishData, followeeDataSubscribe, followeeDataUnsubscribe } from './store'
 
 export { Presence, PresenceAvatars }
 export { updateMyPresence, removeMyPresence, presenceByObjectId } from './store'
@@ -29,5 +30,11 @@ export default async (): Promise<Resources> => ({
     Presence,
     PresenceAvatars,
     WorkbenchExtension
+  },
+  function: {
+    PublishData: publishData,
+    GetFollowee: getFollowee,
+    FolloweeDataSubscribe: followeeDataSubscribe,
+    FolloweeDataUnsubscribe: followeeDataUnsubscribe
   }
 })
diff --git a/plugins/presence-resources/src/store.ts b/plugins/presence-resources/src/store.ts
index 7e6f15ac02d..430966a5732 100644
--- a/plugins/presence-resources/src/store.ts
+++ b/plugins/presence-resources/src/store.ts
@@ -1,5 +1,5 @@
 //
-// Copyright © 2024 Hardcore Engineering Inc.
+// Copyright © 2024-2025 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -16,14 +16,20 @@
 import { type Doc, type Ref } from '@hcengineering/core'
 import { getCurrentEmployee, type Person } from '@hcengineering/contact'
 import { type PresenceData } from '@hcengineering/presence'
-import { type Readable, derived, writable } from 'svelte/store'
+import { personByIdStore } from '@hcengineering/contact-resources'
+import { type Readable, derived, writable, get } from 'svelte/store'
 
-import { type PersonRoomPresence, type Room, type RoomPresence } from './types'
+import type { PersonRoomPresence, Room, RoomPresence, MyDataItem } from './types'
 
 type PersonPresenceMap = Map<Ref<Person>, RoomPresence[]>
 
 export const myPresence = writable<RoomPresence[]>([])
+export const myData = writable<Map<string, MyDataItem>>(new Map())
 export const otherPresence = writable<PersonPresenceMap>(new Map())
+export const followee = writable<Ref<Person> | undefined>(undefined)
+
+const personDataMap = new Map<Ref<Person>, Map<string, any>>()
+const followeeDataHandlers = new Map<string, Set<(data: any) => void>>()
 
 export const presenceByObjectId = derived<Readable<PersonPresenceMap>, Map<Ref<Doc>, PersonRoomPresence[]>>(
   otherPresence,
@@ -70,11 +76,116 @@ export function onPersonUpdate (person: Ref<Person>, presence: RoomPresence[]):
     map.set(person, [...presence])
     return map
   })
+  if (person === get(followee) && !isAnybodyInMyRoom()) {
+    toggleFollowee(undefined)
+  }
 }
 
 export function onPersonLeave (person: Ref<Person>): void {
   otherPresence.update((map) => {
     map.delete(person)
+    toggleFollowee(person)
+    return map
+  })
+}
+
+export function onPersonData (person: Ref<Person>, topic: string, data: any): void {
+  const personData = personDataMap.get(person)
+  if (personData !== undefined) {
+    personData.set(topic, data)
+  } else {
+    personDataMap.set(person, new Map([[topic, data]]))
+  }
+  if (person === get(followee)) {
+    const handlers = followeeDataHandlers.get(topic)
+    if (handlers !== undefined) {
+      for (const handler of handlers) {
+        handler(data)
+      }
+    }
+  }
+}
+
+export function followeeDataSubscribe (topic: string, handler: (data: any) => void): void {
+  const handlers = followeeDataHandlers.get(topic)
+  if (handlers !== undefined) {
+    handlers.add(handler)
+  } else {
+    followeeDataHandlers.set(topic, new Set([handler]))
+  }
+  const f = get(followee)
+  if (f !== undefined) {
+    const followeeData = personDataMap.get(f)
+    if (followeeData !== undefined) {
+      const data = followeeData.get(topic)
+      if (data !== undefined) {
+        handler(data)
+      }
+    }
+  }
+}
+
+export function followeeDataUnsubscribe (topic: string, handler: (data: any) => void): void {
+  const handlers = followeeDataHandlers.get(topic)
+  if (handlers !== undefined) {
+    handlers.delete(handler)
+  }
+}
+
+export function toggleFollowee (person: Ref<Person> | undefined): void {
+  console.log('toggle followee', person)
+  followee.update((p) => (p === person ? undefined : person))
+
+  const f = get(followee)
+  if (f !== undefined) {
+    const otherData = personDataMap.get(f)
+    if (otherData !== undefined) {
+      for (const [topic, data] of otherData) {
+        const handlers = followeeDataHandlers.get(topic)
+        if (handlers !== undefined) {
+          for (const handler of handlers) {
+            handler(data)
+          }
+        }
+      }
+    }
+  } else {
+    console.log('no followee')
+    for (const handlers of followeeDataHandlers.values()) {
+      for (const handler of handlers) {
+        handler(undefined)
+      }
+    }
+  }
+}
+
+export function getFollowee (): Person | undefined {
+  const followeeId = get(followee)
+  if (followeeId === undefined) {
+    return undefined
+  }
+  const personMap = get(personByIdStore)
+  return personMap.get(followeeId)
+}
+
+export function publishData (topic: string, data: any): void {
+  myData.update((map) => {
+    map.set(topic, { lastUpdated: Date.now(), data })
     return map
   })
 }
+
+export function isAnybodyInMyRoom (): boolean {
+  for (const my of get(myPresence)) {
+    for (const others of get(otherPresence).values()) {
+      if (
+        others.find(
+          (other) => other.room.objectId === my.room.objectId && other.room.objectClass === my.room.objectClass
+        ) !== undefined
+      ) {
+        return true
+      }
+    }
+  }
+  return false
+}
diff --git a/plugins/presence-resources/src/types.ts b/plugins/presence-resources/src/types.ts
index 5dc5bbb6441..0a04acce3c4 100644
--- a/plugins/presence-resources/src/types.ts
+++ b/plugins/presence-resources/src/types.ts
@@ -1,5 +1,5 @@
 //
-// Copyright © 2024 Hardcore Engineering Inc.
+// Copyright © 2024-2025 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -40,3 +40,8 @@ export interface PersonPresence {
   presence: RoomPresence[]
   lastUpdated: number
 }
+
+export interface MyDataItem {
+  data: any
+  lastUpdated: number
+}
diff --git a/plugins/presence/package.json b/plugins/presence/package.json
index 5a02e0356c4..5116334e220 100644
--- a/plugins/presence/package.json
+++ b/plugins/presence/package.json
@@ -38,6 +38,7 @@
   },
   "dependencies": {
     "@hcengineering/platform": "^0.6.11",
+    "@hcengineering/contact": "^0.6.24",
     "@hcengineering/core": "^0.6.32",
     "@hcengineering/ui": "^0.6.15"
   },
diff --git a/plugins/presence/src/plugin.ts b/plugins/presence/src/plugin.ts
index c6cb101e4a2..02047fb3f63 100644
--- a/plugins/presence/src/plugin.ts
+++ b/plugins/presence/src/plugin.ts
@@ -1,5 +1,5 @@
 //
-// Copyright © 2024 Hardcore Engineering Inc.
+// Copyright © 2024-2025 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -13,7 +13,8 @@
 // limitations under the License.
 //
 
-import type { Metadata, Plugin } from '@hcengineering/platform'
+import type { Person } from '@hcengineering/contact'
+import type { Metadata, Plugin, Resource } from '@hcengineering/platform'
 import { plugin } from '@hcengineering/platform'
 import { AnyComponent } from '@hcengineering/ui/src/types'
 
@@ -27,6 +28,12 @@ export const presencePlugin = plugin(presenceId, {
   component: {
     Presence: '' as AnyComponent,
     PresenceAvatars: '' as AnyComponent
+  },
+  function: {
+    PublishData: '' as Resource<(topic: string, data: any) => void>,
+    GetFollowee: '' as Resource<() => Person | undefined>,
+    FolloweeDataSubscribe: '' as Resource<(topic: string, handler: (data: any) => void) => void>,
+    FolloweeDataUnsubscribe: '' as Resource<(topic: string, handler: (data: any) => void) => void>
   }
 })
 
diff --git a/plugins/text-editor-resources/package.json b/plugins/text-editor-resources/package.json
index d8f589ab212..afcd77df023 100644
--- a/plugins/text-editor-resources/package.json
+++ b/plugins/text-editor-resources/package.json
@@ -50,6 +50,8 @@
     "@hcengineering/text": "^0.6.5",
     "@hcengineering/text-editor": "^0.6.0",
     "@hcengineering/collaborator-client": "^0.6.4",
+    "@hcengineering/contact": "^0.6.24",
+    "@hcengineering/presence": "^0.6.0",
     "@tiptap/core": "^2.11.3",
     "@tiptap/pm": "^2.11.3",
     "@tiptap/extension-code-block-lowlight": "^2.11.3",
diff --git a/plugins/text-editor-resources/src/components/DrawingBoardEditor.svelte b/plugins/text-editor-resources/src/components/DrawingBoardEditor.svelte
index 65d1f504afe..5692bfb9e72 100644
--- a/plugins/text-editor-resources/src/components/DrawingBoardEditor.svelte
+++ b/plugins/text-editor-resources/src/components/DrawingBoardEditor.svelte
@@ -1,5 +1,5 @@
 <!--
-// Copyright © 2024 Hardcore Engineering Inc.
+// Copyright © 2024-2025 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -13,18 +13,23 @@
 // limitations under the License.
 -->
 <script lang="ts">
+  import contact, { type Person } from '@hcengineering/contact'
   import {
     DrawingBoardToolbar,
     DrawingCmd,
     DrawingTool,
     DrawTextCmd,
+    Point,
     drawing,
     makeCommandId
   } from '@hcengineering/presentation'
-  import { Loading } from '@hcengineering/ui'
+  import presence from '@hcengineering/presence'
+  import { getResource } from '@hcengineering/platform'
+  import { Loading, Component } from '@hcengineering/ui'
   import { onMount, onDestroy } from 'svelte'
   import { Array as YArray, Map as YMap } from 'yjs'
 
+  export let boardId: string
   export let savedCmds: YArray<DrawingCmd>
   export let savedProps: YMap<any>
   export let grabFocus = false
@@ -33,6 +38,7 @@
   export let readonly = false
   export let selected = false
   export let loading = false
+  export let fullSize = false
 
   let tool: DrawingTool
   let penColor: string
@@ -43,23 +49,27 @@
   let offset: { x: number, y: number } = { x: 0, y: 0 }
   let changingCmdId: string | undefined
   let cmdEditor: HTMLDivElement | undefined
+  let personCursorCanvasPos: Point | undefined
+  let personCursorNodePos: Point | undefined
+  let personCursorVisible = false
   let toolbar: HTMLDivElement
   let oldSelected = false
   let oldReadonly = false
+  let sendLiveData: ((key: string, data: any) => void) | undefined
+  let getFollowee: (() => Person | undefined) | undefined
+  let panning = false
+  let followee: Person | undefined
+  const dataTopicOffset = 'drawing-board-offset'
+  const dataTopicCursor = 'drawing-board-cursor'
 
   $: onSelectedChanged(selected)
   $: onReadonlyChanged(readonly)
+  $: onOffsetChanged(offset)
 
   function listenSavedCommands (): void {
     commands = savedCmds.toArray()
   }
 
-  function listenSavedProps (): void {
-    // We have only local offset for now
-    // A global offset should be implemented as a "Follow" feature
-    // offset = savedProps.get('offset')
-  }
-
   function showCommandProps (id: string): void {
     changingCmdId = id
     for (const cmd of commands) {
@@ -133,16 +143,79 @@
     }
   }
 
+  function onOffsetChanged (offset: Point): void {
+    if (sendLiveData !== undefined) {
+      sendLiveData(dataTopicOffset, { boardId, offset: { ...offset } })
+    }
+  }
+
+  function onPointerMoved (canvasPos: Point): void {
+    if (sendLiveData !== undefined && selected && !panning) {
+      sendLiveData(dataTopicCursor, { boardId, cursorPos: { ...canvasPos } })
+    }
+  }
+
+  function onFolloweeData (data: any): void {
+    if (data === undefined) {
+      followee = undefined
+      personCursorVisible = false
+      return
+    }
+    if (followee === undefined && getFollowee !== undefined) {
+      followee = getFollowee()
+    }
+    if (data.boardId === boardId) {
+      const newOffset = data.offset
+      if (newOffset !== undefined && newOffset.x !== offset.x && newOffset.y !== offset.y) {
+        offset = { ...newOffset }
+      }
+      const cursorPos = data.cursorPos
+      if (cursorPos !== undefined) {
+        personCursorVisible = true
+        personCursorCanvasPos = { ...cursorPos }
+      }
+    }
+  }
+
   onMount(() => {
     commands = savedCmds.toArray()
-    // offset = savedProps.get('offset')
     savedCmds.observe(listenSavedCommands)
-    savedProps.observe(listenSavedProps)
+
+    getResource(presence.function.PublishData)
+      .then((func) => {
+        sendLiveData = func
+      })
+      .catch((err) => {
+        console.error('Failed to get presence.function.PublishData', err)
+      })
+    getResource(presence.function.GetFollowee)
+      .then((func) => {
+        getFollowee = func
+      })
+      .catch((err) => {
+        console.error('Failed to get presence.function.GetFollowee', err)
+      })
+    getResource(presence.function.FolloweeDataSubscribe)
+      .then((subscribe) => {
+        subscribe(dataTopicOffset, onFolloweeData)
+        subscribe(dataTopicCursor, onFolloweeData)
+      })
+      .catch((err) => {
+        console.error('Failed to get presence.function.FolloweeDataSubscribe', err)
+      })
   })
 
   onDestroy(() => {
     savedCmds.unobserve(listenSavedCommands)
-    savedProps.unobserve(listenSavedProps)
+
+    getResource(presence.function.FolloweeDataUnsubscribe)
+      .then((unsubscribe) => {
+        unsubscribe(dataTopicOffset, onFolloweeData)
+        unsubscribe(dataTopicCursor, onFolloweeData)
+      })
+      .catch((err) => {
+        console.error('failed to get presence.function.FolloweeDataUnsubscribe', err)
+      })
   })
 </script>
 
@@ -150,7 +223,8 @@
   {#if loading}
     <div
       class="board"
-      class:selected
+      class:fullSize
+      class:selected={selected && !fullSize}
       style:flex-grow={resizeable ? undefined : '1'}
       style:height={resizeable ? `${height}px` : undefined}
     >
@@ -160,7 +234,8 @@
   {:else}
     <div
       class="board"
-      class:selected
+      class:fullSize
+      class:selected={selected && !fullSize}
       style:flex-grow={resizeable ? undefined : '1'}
       style:height={resizeable ? `${height}px` : undefined}
       use:drawing={{
@@ -173,6 +248,7 @@
         penWidth,
         eraserWidth,
         fontSize,
+        personCursorPos: personCursorCanvasPos,
         changingCmdId,
         cmdAdded: (cmd) => {
           savedCmds.push([cmd])
@@ -184,12 +260,21 @@
           changingCmdId = undefined
         },
         cmdDeleted: deleteCommand,
+        panning: () => {
+          panning = true
+        },
         panned: (newOffset) => {
+          panning = false
           offset = newOffset
-          // savedProps.set('offset', offset)
         },
         editorCreated: (editor) => {
           cmdEditor = editor
+        },
+        pointerMoved: (canvasPos) => {
+          onPointerMoved(canvasPos)
+        },
+        personCursorMoved: (nodePos) => {
+          personCursorNodePos = nodePos
         }
       }}
     >
@@ -212,11 +297,29 @@
           on:clear={() => {
             savedCmds.delete(0, savedCmds.length)
             offset = { x: 0, y: 0 }
-            // savedProps.set('offset', { x: 0, y: 0 })
           }}
         />
       {/if}
       <slot />
+      {#if personCursorVisible && personCursorNodePos !== undefined && followee !== undefined}
+        <div class="personCursor" style:left={`${personCursorNodePos.x}px`} style:top={`${personCursorNodePos.y}px`}>
+          <div class="personAvatar">
+            <Component
+              is={contact.component.Avatar}
+              props={{
+                size: 'small',
+                person: followee,
+                name: followee.name
+              }}
+            />
+          </div>
+          <div class="arrowFrame">
+            <svg width="40px" height="40px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg">
+              <path class="cursorArrow" d="m1.2 1.04v13.5l3.34-1.37 2.14 5 2.61-1.12-1.99-5 3.33-1.49z" />
+            </svg>
+          </div>
+        </div>
+      {/if}
     </div>
   {/if}
 {/if}
@@ -226,11 +329,43 @@
     position: relative;
     width: 100%;
     background-color: var(--drawing-bg-color);
-    border: 1px solid var(--theme-navpanel-border);
     border-radius: var(--small-BorderRadius);
+    border: 1px solid var(--theme-navpanel-border);
+
+    &.fullSize {
+      border-radius: unset;
+      border: none;
+    }
 
     &.selected {
       border: 1px solid var(--theme-editbox-focus-border);
     }
   }
+
+  .personCursor {
+    position: absolute;
+    z-index: 20;
+    width: 40px;
+    height: 40px;
+  }
+
+  .personAvatar {
+    position: absolute;
+    left: 7px;
+    top: 17px;
+    border-radius: 20%;
+    box-shadow: 0.05rem 0.05rem 0.3rem rgba(0, 0, 0, 0.5);
+  }
+
+  .arrowFrame {
+    position: absolute;
+  }
+
+  .cursorArrow {
+    fill: #efefef;
+    stroke: #222222;
+    stroke-width: 1.2;
+    stroke-linejoin: round;
+    filter: drop-shadow(2px 2px 3px rgba(0, 0, 0, 0.3));
+  }
 </style>
diff --git a/plugins/text-editor-resources/src/components/DrawingBoardNodeView.svelte b/plugins/text-editor-resources/src/components/DrawingBoardNodeView.svelte
index 53e7fc25b72..4bb5085bf36 100644
--- a/plugins/text-editor-resources/src/components/DrawingBoardNodeView.svelte
+++ b/plugins/text-editor-resources/src/components/DrawingBoardNodeView.svelte
@@ -1,5 +1,5 @@
 <!--
-// Copyright © 2024 Hardcore Engineering Inc.
+// Copyright © 2024-2025 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -136,6 +136,7 @@
 {#if savedBoard?.commands !== undefined && savedBoard?.props !== undefined}
   <NodeViewWrapper data-drag-handle="" data-type="drawingBoard" data-id={node.attrs.id}>
     <DrawingBoardEditor
+      boardId={node.attrs.id}
       savedCmds={savedBoard.commands}
       savedProps={savedBoard.props}
       resizeable={true}
@@ -151,7 +152,7 @@
           disabled={loading}
           noFocus
           on:click={() => {
-            showBoardPopup(savedBoard, editor)
+            showBoardPopup(node.attrs.id, savedBoard, editor)
           }}
         />
       </div>
diff --git a/plugins/text-editor-resources/src/components/DrawingBoardPopup.svelte b/plugins/text-editor-resources/src/components/DrawingBoardPopup.svelte
index 640f19da682..2ba375c353e 100644
--- a/plugins/text-editor-resources/src/components/DrawingBoardPopup.svelte
+++ b/plugins/text-editor-resources/src/components/DrawingBoardPopup.svelte
@@ -1,5 +1,5 @@
 <!--
-// Copyright © 2024 Hardcore Engineering Inc.
+// Copyright © 2024-2025 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -15,11 +15,12 @@
 <script lang="ts">
   import { DrawingCmd } from '@hcengineering/presentation'
   import textEditor from '@hcengineering/text-editor'
-  import { Dialog, FocusHandler, createFocusManager } from '@hcengineering/ui'
+  import { Dialog } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
   import { Array as YArray, Map as YMap } from 'yjs'
   import DrawingBoardEditor from './DrawingBoardEditor.svelte'
 
+  export let boardId: string
   export let savedCmds: YArray<DrawingCmd>
   export let savedProps: YMap<any>
   export let readonly = false
@@ -42,6 +43,6 @@
       dispatch('close')
     }}
   >
-    <DrawingBoardEditor {savedCmds} {savedProps} {readonly} grabFocus />
+    <DrawingBoardEditor {boardId} {savedCmds} {savedProps} {readonly} selected fullSize grabFocus />
   </Dialog>
 {/if}
diff --git a/plugins/text-editor-resources/src/components/extension/drawingBoard.ts b/plugins/text-editor-resources/src/components/extension/drawingBoard.ts
index 4cd81eb0192..c44d1395e91 100644
--- a/plugins/text-editor-resources/src/components/extension/drawingBoard.ts
+++ b/plugins/text-editor-resources/src/components/extension/drawingBoard.ts
@@ -1,5 +1,5 @@
 //
-// Copyright © 2024 Hardcore Engineering Inc.
+// Copyright © 2024-2025 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -32,11 +32,12 @@ export interface SavedBoard {
   loading: boolean
 }
 
-export function showBoardPopup (board: SavedBoard, editor: Editor): void {
+export function showBoardPopup (id: string, board: SavedBoard, editor: Editor): void {
   if (board.commands !== undefined && board.props !== undefined) {
     showPopup(
       DrawingBoardPopup,
       {
+        boardId: id,
         savedCmds: board.commands,
         savedProps: board.props,
         readonly: !editor.isEditable
@@ -105,7 +106,7 @@ export const DrawingBoardExtension = Node.create<DrawingBoardOptions>({
               if (node?.type.name === this.name) {
                 const board = this.options.getSavedBoard(node.attrs.id)
                 if (!board.loading) {
-                  showBoardPopup(board, this.editor)
+                  showBoardPopup(node.attrs.id, board, this.editor)
                 }
                 return true
               }