diff --git a/src/core/Boxes/boundingbox.cpp b/src/core/Boxes/boundingbox.cpp
index 1b20a8e13..38a7235c9 100644
--- a/src/core/Boxes/boundingbox.cpp
+++ b/src/core/Boxes/boundingbox.cpp
@@ -948,11 +948,10 @@ void BoundingBox::alignPivotItself(const Qt::Alignment align,
         }
     }
 
-    startPosTransform();
-    // TODO: get undo/redo to save last previous state
+    startPivotTransform();
     mTransformAnimator->setPivotFixedTransform(center);
     requestGlobalPivotUpdateIfSelected();
-    finishTransform();
+    finishPivotTransform();
 }
 
 void BoundingBox::moveByAbs(const QPointF &trans) {
diff --git a/src/core/canvasselectedboxesactions.cpp b/src/core/canvasselectedboxesactions.cpp
index cc94c0d65..462735daa 100644
--- a/src/core/canvasselectedboxesactions.cpp
+++ b/src/core/canvasselectedboxesactions.cpp
@@ -876,8 +876,8 @@ void Canvas::alignSelectedBoxes(const Qt::Alignment align,
         break;
     }
 
-    pushUndoRedoName("align");
-    for(const auto &box : mSelectedBoxes) {
+    pushUndoRedoName(pivot == AlignPivot::pivotItself ? "pivot align" : "box align");
+    for (const auto &box : mSelectedBoxes) {
         if (box == skip) { continue; }
         switch(pivot) {
         case AlignPivot::pivot: