diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/view/shellIntegration/impl/TerminalBlocksModelImpl.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/view/shellIntegration/impl/TerminalBlocksModelImpl.kt
index a21107f1748d..427674746939 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/view/shellIntegration/impl/TerminalBlocksModelImpl.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/view/shellIntegration/impl/TerminalBlocksModelImpl.kt
@@ -43,6 +43,7 @@ class TerminalBlocksModelImpl(
         trimBlocksAfter(outputModel.endOffset)
         if (!event.isTrimming) {
           trimBlocksAfter(event.offset)
+          adjustActiveBlockOffsets(event)
         }
       }
     })
@@ -86,7 +87,7 @@ class TerminalBlocksModelImpl(
   }
 
   /**
-   * Removes all blocks that end before the [offset] (inclusive), and adjusts all left blocks offsets.
+   * Removes all blocks that end before the [offset] (inclusive).
    */
   private fun trimBlocksBefore(offset: TerminalOffset) {
     val firstNotRemovedBlockIndex = blocks.indexOfFirst { it.endOffset > offset || (it.startOffset == it.endOffset && it.endOffset == offset) }
@@ -104,7 +105,7 @@ class TerminalBlocksModelImpl(
   }
 
   /**
-   * Removes all blocks that start after [offset] and adjusts the end offset of the last block.
+   * Removes all blocks that start after [offset].
    */
   private fun trimBlocksAfter(offset: TerminalOffset) {
     val firstBlockToRemoveIndex = blocks.indexOfFirst { it.startOffset > offset }
@@ -118,10 +119,35 @@ class TerminalBlocksModelImpl(
     if (blocks.isEmpty()) {
       addNewBlock(outputModel.startOffset)
     }
-    else {
-      val active = activeBlock as TerminalCommandBlockImpl
-      activeBlock = active.copy(endOffset = outputModel.endOffset)
+  }
+
+  private fun adjustActiveBlockOffsets(event: TerminalContentChangeEvent) {
+    var block = activeBlock as TerminalCommandBlockImpl
+
+    val delta = event.newText.length.toLong() - event.oldText.length
+    if (block.commandStartOffset != null
+        && event.offset >= block.startOffset
+        && event.offset + event.oldText.length.toLong() < block.commandStartOffset) {
+      // Text changed inside the prompt after the command start offset was already set, let's update further offsets.
+      block = block.copy(
+        commandStartOffset = block.commandStartOffset + delta,
+        outputStartOffset = block.outputStartOffset?.let { it + delta },
+      )
     }
+    else if (block.commandStartOffset != null && block.outputStartOffset != null
+             && event.offset >= block.commandStartOffset
+             && event.offset + event.oldText.length.toLong() < block.outputStartOffset) {
+      // Text changed inside the command text after command was started, let's update further offsets.
+      // Shouldn't be the case, because command text shouldn't be changed after command is started,
+      // but let's consider this case as well.
+      block = block.copy(outputStartOffset = block.outputStartOffset + delta)
+    }
+    // Else:
+    // Command text or output was changed - updating block end offset is enough.
+    // 2+ parts (prompt/command/output) were changed in a single event, can't predict how to change the offsets.
+
+    // Always set the active block end offset to the end of the output.
+    activeBlock = block.copy(endOffset = outputModel.endOffset)
   }
 
   private fun replaceBlocks(newBlocks: List<TerminalBlockBase>) {
diff --git a/plugins/terminal/tests/src/com/intellij/terminal/tests/reworked/TerminalBlocksModelTest.kt b/plugins/terminal/tests/src/com/intellij/terminal/tests/reworked/TerminalBlocksModelTest.kt
index ef22f4d8f20f..a09c8b521e20 100644
--- a/plugins/terminal/tests/src/com/intellij/terminal/tests/reworked/TerminalBlocksModelTest.kt
+++ b/plugins/terminal/tests/src/com/intellij/terminal/tests/reworked/TerminalBlocksModelTest.kt
@@ -99,6 +99,59 @@ internal class TerminalBlocksModelTest : BasePlatformTestCase() {
     assertEquals("myPrompt: \n\n\n", outputModel.getTextAsString(block.startOffset, block.endOffset))
   }
 
+  @Test
+  fun `command start offset is updated correctly after prompt reprinting`() = runBlocking(Dispatchers.EDT) {
+    val outputModel = TerminalTestUtil.createOutputModel()
+    val blocksModel = createBlocksModel(outputModel)
+
+    // Prepare
+    outputModel.update(0, "\n\n\n")
+    blocksModel.startNewBlock(TerminalOffset.ZERO)
+    outputModel.update(0, "myPrompt ... > \n\n\n")
+    blocksModel.updateCommandStartOffset(TerminalOffset.of(15))
+    outputModel.update(0, "myPrompt ... > 123\n\n\n")
+
+    // Test
+    blocksModel.startNewBlock(TerminalOffset.ZERO)
+    outputModel.update(0, "myPrompt (main) > 123\n\n\n")
+    blocksModel.updateCommandStartOffset(TerminalOffset.of(18))
+
+
+    assertEquals(1, blocksModel.blocks.size)
+    val block = blocksModel.activeBlock as TerminalCommandBlock
+
+    assertEquals(TerminalOffset.ZERO, block.startOffset)
+    assertEquals(TerminalOffset.of(18), block.commandStartOffset)
+    assertEquals(null, block.outputStartOffset)
+    assertEquals(TerminalOffset.of(24), block.endOffset)
+    assertEquals("123", block.getTypedCommandText(outputModel))
+  }
+
+  @Test
+  fun `command start offset is updated text change inside prompt`() = runBlocking(Dispatchers.EDT) {
+    val outputModel = TerminalTestUtil.createOutputModel()
+    val blocksModel = createBlocksModel(outputModel)
+
+    // Prepare
+    outputModel.update(0, "\n\n\n")
+    blocksModel.startNewBlock(TerminalOffset.ZERO)
+    outputModel.update(0, "myPrompt ... > \n\n\n")
+    blocksModel.updateCommandStartOffset(TerminalOffset.of(15))
+    outputModel.update(0, "myPrompt ... > 123\n\n\n")
+
+    // Test
+    outputModel.update(0, "myPrompt (main) > 123\n\n\n")
+
+    assertEquals(1, blocksModel.blocks.size)
+    val block = blocksModel.activeBlock as TerminalCommandBlock
+
+    assertEquals(TerminalOffset.ZERO, block.startOffset)
+    assertEquals(TerminalOffset.of(18), block.commandStartOffset)
+    assertEquals(null, block.outputStartOffset)
+    assertEquals(TerminalOffset.of(24), block.endOffset)
+    assertEquals("123", block.getTypedCommandText(outputModel))
+  }
+
   @Test
   fun `block end offset is updated on command typing`() = runBlocking(Dispatchers.EDT) {
     val outputModel = TerminalTestUtil.createOutputModel()