diff --git a/packages/ui/src/components/Component.svelte b/packages/ui/src/components/Component.svelte
index 4ea4888512d..6e121965919 100644
--- a/packages/ui/src/components/Component.svelte
+++ b/packages/ui/src/components/Component.svelte
@@ -120,6 +120,8 @@
           on:validate
           on:submit
           on:select
+          on:keydown
+          on:editingEnded
         >
           <slot />
         </svelte:component>
@@ -140,6 +142,8 @@
           on:validate
           on:submit
           on:select
+          on:keydown
+          on:editingEnded
         />
       {/if}
     </ErrorBoundary>
diff --git a/plugins/activity-resources/src/components/ActivityExtension.svelte b/plugins/activity-resources/src/components/ActivityExtension.svelte
index 908bd5a16d9..a1fcaca87e6 100644
--- a/plugins/activity-resources/src/components/ActivityExtension.svelte
+++ b/plugins/activity-resources/src/components/ActivityExtension.svelte
@@ -30,5 +30,6 @@
     on:close
     on:open
     on:submit
+    on:keydown
   />
 {/if}
diff --git a/plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte b/plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte
index a940950f32c..45ad9c484af 100644
--- a/plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte
+++ b/plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte
@@ -42,6 +42,7 @@
   export let readonly = false
   export let onClick: (() => void) | undefined = undefined
   export let onReply: ((message: ActivityMessage) => void) | undefined = undefined
+  export let isEditing = false
 
   const client = getClient()
   const hierarchy = client.getHierarchy()
@@ -76,7 +77,9 @@
       compact,
       readonly,
       onClick,
-      onReply
+      onReply,
+      isEditing
     }}
+    on:editingEnded
   />
 {/if}
diff --git a/plugins/attachment-resources/src/components/AttachmentRefInput.svelte b/plugins/attachment-resources/src/components/AttachmentRefInput.svelte
index 68d0376ed6f..4a8ef4eaa17 100644
--- a/plugins/attachment-resources/src/components/AttachmentRefInput.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentRefInput.svelte
@@ -462,6 +462,7 @@
       on:message={onMessage}
       on:update={onUpdate}
       onPaste={pasteAction}
+      on:keydown
       {placeholder}
     >
       <div slot="header">
diff --git a/plugins/chunter-resources/src/components/ChannelInput.svelte b/plugins/chunter-resources/src/components/ChannelInput.svelte
index ccc9c02594c..e850989641b 100644
--- a/plugins/chunter-resources/src/components/ChannelInput.svelte
+++ b/plugins/chunter-resources/src/components/ChannelInput.svelte
@@ -87,6 +87,7 @@
       kind="input"
       {extensions}
       props={{ object, boundary, collection, autofocus, withTypingInfo: true }}
+      on:keydown
     />
   </div>
 {:else}
diff --git a/plugins/chunter-resources/src/components/ReverseChannelScrollView.svelte b/plugins/chunter-resources/src/components/ReverseChannelScrollView.svelte
index 9518f748dd7..aa57d6bef64 100644
--- a/plugins/chunter-resources/src/components/ReverseChannelScrollView.svelte
+++ b/plugins/chunter-resources/src/components/ReverseChannelScrollView.svelte
@@ -13,6 +13,8 @@
 // limitations under the License.
 -->
 <script lang="ts">
+  import { getCurrentEmployee } from '@hcengineering/contact'
+  import { personByPersonIdStore } from '@hcengineering/contact-resources'
   import activity, { ActivityMessage } from '@hcengineering/activity'
   import { ActivityMessagePresenter, canGroupMessages, messageInFocus } from '@hcengineering/activity-resources'
   import core, { Doc, generateId, getCurrentAccount, Ref, Space, Timestamp, Tx, TxCUD } from '@hcengineering/core'
@@ -58,6 +60,8 @@
   const contextByDocStore = inboxClient.contextByDoc
   const notificationsByContextStore = inboxClient.inboxNotificationsByContext
 
+  const me = getCurrentEmployee()
+
   // Stores
   const metadataStore = provider.metadataStore
   const messagesStore = provider.messagesStore
@@ -74,6 +78,8 @@
   let messages: ActivityMessage[] = []
   let messagesCount = 0
 
+  let editingMessageId: Ref<ActivityMessage> | undefined = undefined
+
   // Elements
   let scroller: Scroller | undefined | null = undefined
   let scrollDiv: HTMLDivElement | undefined | null = undefined
@@ -128,6 +134,15 @@
   $: adjustScrollPosition(selectedMessageId)
   $: void handleMessagesUpdated(messages.length)
 
+  function getLastOwnMessage (): ActivityMessage | undefined {
+    return [...messages].reverse().find((message) => {
+      const personId = message.createdBy
+      if (personId === undefined) return false
+      const person = $personByPersonIdStore.get(personId)
+      return person?._id === me
+    })
+  }
+
   function adjustScrollPosition (selectedMessageId?: Ref<ActivityMessage>): void {
     if ($isLoadingStore || !isScrollInitialized) {
       return
@@ -537,6 +552,21 @@
     loadMore()
   }
 
+  function onKeydown (key: KeyboardEvent): void {
+    if (key.code !== 'ArrowUp') return
+
+    const target = key.target as HTMLElement
+    const isEmpty = target.textContent?.trim() === ''
+    if (isEmpty) {
+      const ownLastMessage = getLastOwnMessage()
+      if (ownLastMessage !== undefined) {
+        key.preventDefault()
+        key.stopPropagation()
+        editingMessageId = ownLastMessage._id
+      }
+    }
+  }
+
   const newMessageTxListener = (txes: Tx[]): void => {
     const ctx = txes
       .map((it) => it as TxCUD<ActivityMessage>)
@@ -603,6 +633,7 @@
 
     {#each messages as message, index (message._id)}
       {@const isSelected = message._id === selectedMessageId}
+      {@const isEditing = message._id === editingMessageId}
       {@const canGroup = canGroupChatMessages(message, messages[index - 1])}
       {#if separatorIndex === index}
         <ActivityMessagesSeparator bind:element={separatorDiv} label={activity.string.New} />
@@ -626,6 +657,12 @@
         type={canGroup ? 'short' : 'default'}
         isHighlighted={isSelected}
         shouldScroll={false}
+        isEditing={isEditing}
+        on:editingEnded={() => {
+          if (editingMessageId === message._id) {
+            editingMessageId = undefined
+          }
+        }}
         {readonly}
         {onReply}
       />
@@ -639,7 +676,7 @@
       <HistoryLoading isLoading={$isLoadingMoreStore} />
     {/if}
     {#if !fixedInput && withInput && !readonly}
-      <ChannelInput {object} {readonly} boundary={scrollDiv} {collection} {isThread} {autofocus} />
+      <ChannelInput {object} {readonly} boundary={scrollDiv} {collection} {isThread} {autofocus} on:keydown={(event) => { onKeydown(event) }}/>
     {/if}
   </BaseChatScroller>
   {#if !isThread && isLatestMessageButtonVisible}
@@ -656,7 +693,7 @@
 </div>
 
 {#if fixedInput && withInput && !readonly}
-  <ChannelInput {object} {readonly} boundary={scrollDiv} {collection} {isThread} {autofocus} />
+  <ChannelInput {object} {readonly} boundary={scrollDiv} {collection} {isThread} {autofocus} on:keydown={(event) => { onKeydown(event) }} />
 {/if}
 
 {#if readonly}
diff --git a/plugins/chunter-resources/src/components/chat-message/ChatMessageInput.svelte b/plugins/chunter-resources/src/components/chat-message/ChatMessageInput.svelte
index 003476bf12a..0a3228c9b35 100644
--- a/plugins/chunter-resources/src/components/chat-message/ChatMessageInput.svelte
+++ b/plugins/chunter-resources/src/components/chat-message/ChatMessageInput.svelte
@@ -241,6 +241,7 @@
   on:update={onUpdate}
   on:focus
   on:blur
+  on:keydown
   bind:loading
 />
 
diff --git a/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte b/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte
index 5e6d9a897e4..0d2eec612e7 100644
--- a/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte
+++ b/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte
@@ -30,6 +30,7 @@
   import { Action, Button, IconEdit, ShowMore } from '@hcengineering/ui'
   import view from '@hcengineering/view'
   import { getDocLinkTitle } from '@hcengineering/view-resources'
+  import { createEventDispatcher } from 'svelte'
 
   import { shownTranslatedMessagesStore, translatedMessagesStore, translatingMessagesStore } from '../../stores'
   import ChatMessageHeader from './ChatMessageHeader.svelte'
@@ -59,11 +60,13 @@
   export let type: ActivityMessageViewType = 'default'
   export let onClick: (() => void) | undefined = undefined
   export let onReply: ((message: ActivityMessage) => void) | undefined = undefined
+  export let isEditing = false
 
   const client = getClient()
   const hierarchy = client.getHierarchy()
   const STALE_TIMEOUT_MS = 5000
   const me = getCurrentEmployee()
+  const dispatch = createEventDispatcher()
 
   let parentMessage: DisplayActivityMessage | undefined = undefined
   let object: Doc | undefined
@@ -146,7 +149,6 @@
     isEditing = true
   }
 
-  let isEditing = false
   let additionalActions: Action[] = []
 
   $: isOwn = person !== undefined && person._id === me
@@ -291,6 +293,7 @@
           {object}
           on:submit={() => {
             isEditing = false
+            dispatch('editingEnded')
           }}
         />
         <div class="flex-row-center gap-2 justify-end mt-2">
@@ -298,6 +301,7 @@
             label={view.string.Cancel}
             on:click={() => {
               isEditing = false
+              dispatch('editingEnded')
             }}
           />
           <Button label={activity.string.Update} accent on:click={() => refInput.submit()} />
diff --git a/plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte b/plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte
index 49205c35ead..3e571abb8c4 100644
--- a/plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte
+++ b/plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte
@@ -41,6 +41,7 @@
   export let videoPreload = false
   export let readonly = false
   export let onClick: (() => void) | undefined = undefined
+  export let isEditing = false
 
   const client = getClient()
 </script>
@@ -76,5 +77,6 @@
     {videoPreload}
     {onClick}
     {readonly}
+    {isEditing}
   />
 {/if}
diff --git a/plugins/text-editor-resources/src/components/ReferenceInput.svelte b/plugins/text-editor-resources/src/components/ReferenceInput.svelte
index 1467ad9db93..0437a57b8fa 100644
--- a/plugins/text-editor-resources/src/components/ReferenceInput.svelte
+++ b/plugins/text-editor-resources/src/components/ReferenceInput.svelte
@@ -178,6 +178,7 @@
         updateFocus()
         dispatch('focus')
       }}
+      on:keydown
       extensions={[
         completionPlugin,
         EmojiExtension.configure(),
diff --git a/plugins/text-editor-resources/src/components/TextEditor.svelte b/plugins/text-editor-resources/src/components/TextEditor.svelte
index 6beb9511de8..19c9a83d360 100644
--- a/plugins/text-editor-resources/src/components/TextEditor.svelte
+++ b/plugins/text-editor-resources/src/components/TextEditor.svelte
@@ -235,4 +235,4 @@
   <TextEditorToolbar bind:toolbar={imageToolbarElement} kind="image" {editor} on:focus={handleFocus} />
 {/if}
 
-<div class="select-text" style="width: 100%;" bind:this={element} />
+<div class="select-text" style="width: 100%;" bind:this={element} on:keydown />
diff --git a/plugins/view/src/types.ts b/plugins/view/src/types.ts
index a16efc331eb..555685ba17f 100644
--- a/plugins/view/src/types.ts
+++ b/plugins/view/src/types.ts
@@ -533,7 +533,7 @@ export interface Action<T extends Doc = Doc, P = Record<string, any>> extends Do
   // If defined, types should be matched to proposed list
   inputProps?: Record<string, Ref<Class<Doc>>>
 
-  // Kayboard bindings
+  // Keyboard bindings
   keyBinding?: KeyBinding[]
 
   // short description for action.