diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp
index 97e8233c..6bf80853 100644
--- a/src/board/UBBoardView.cpp
+++ b/src/board/UBBoardView.cpp
@@ -1310,10 +1310,6 @@ void UBBoardView::mouseReleaseEvent (QMouseEvent *event)
     }
     else if (currentTool == UBStylusTool::Text)
     {
-        UBGraphicsItem *graphicsItem = dynamic_cast<UBGraphicsItem*>(movingItem);
-        if (graphicsItem)
-            graphicsItem->Delegate()->commitUndoStep();
-
         bool bReleaseIsNeed = true;
         if (movingItem != determineItemToPress(scene()->itemAt(this->mapToScene(event->localPos().toPoint()), QTransform())))
         {
@@ -1321,6 +1317,10 @@ void UBBoardView::mouseReleaseEvent (QMouseEvent *event)
             bReleaseIsNeed = false;
         }
 
+        UBGraphicsItem *graphicsItem = dynamic_cast<UBGraphicsItem*>(movingItem);
+        if (graphicsItem)
+            graphicsItem->Delegate()->commitUndoStep();
+
         if (mWidgetMoved)
         {
             mWidgetMoved = false;