diff --git a/src/Greenshot.Base/Interfaces/ISurface.cs b/src/Greenshot.Base/Interfaces/ISurface.cs
index 709e4bf6e..a51a28666 100644
--- a/src/Greenshot.Base/Interfaces/ISurface.cs
+++ b/src/Greenshot.Base/Interfaces/ISurface.cs
@@ -163,6 +163,7 @@ namespace Greenshot.Base.Interfaces
 
         void SendMessageEvent(object source, SurfaceMessageTyp messageType, string message);
         void ResizeCanvas(int left, int right, int top, int bottom);
+        void RecordElementMoved();
         void ApplyBitmapEffect(IEffect effect);
         void RemoveCursor();
         bool HasCursor { get; }
diff --git a/src/Greenshot.Editor/Drawing/DrawableContainerList.cs b/src/Greenshot.Editor/Drawing/DrawableContainerList.cs
index e822337ce..69907b97d 100644
--- a/src/Greenshot.Editor/Drawing/DrawableContainerList.cs
+++ b/src/Greenshot.Editor/Drawing/DrawableContainerList.cs
@@ -598,53 +598,50 @@ namespace Greenshot.Editor.Drawing
             };
             menu.Items.Add(item);
 
-            ToolStripMenuItem alignSubmenu = new ToolStripMenuItem("Align/Stack");
+            // Push out
+            ToolStripMenuItem alignSubmenu = new ToolStripMenuItem("Push Out");
 
-            // Align
-            item = new ToolStripMenuItem("Align Right")
+            // Right
+            item = new ToolStripMenuItem("Right")
             {
-                Image = (Image)EditorFormResources.GetObject("removeObjectToolStripMenuItem.Image")
+                Image = (Image)EditorFormResources.GetObject("copyToolStripMenuItem.Image")
             };
-            // Action to perform on click.
             item.Click += delegate
             {
-                AlignOrStack("right", surface, this[0], this);
+                PushOut("right", surface, this[0], this);
             };
             alignSubmenu.DropDownItems.Add(item);
 
             // Left
-            item = new ToolStripMenuItem("Align Left")
+            item = new ToolStripMenuItem("Left")
             {
-                Image = (Image)EditorFormResources.GetObject("removeObjectToolStripMenuItem.Image")
+                Image = (Image)EditorFormResources.GetObject("copyToolStripMenuItem.Image")
             };
-            // Action to perform on click.
             item.Click += delegate
             {
-                AlignOrStack("left", surface, this[0], this);
+                PushOut("left", surface, this[0], this);
             };
             alignSubmenu.DropDownItems.Add(item);
 
             // Top
-            item = new ToolStripMenuItem("Stack on Top")
+            item = new ToolStripMenuItem("Top")
             {
-                Image = (Image)EditorFormResources.GetObject("removeObjectToolStripMenuItem.Image")
+                Image = (Image)EditorFormResources.GetObject("copyToolStripMenuItem.Image")
             };
-            // Action to perform on click.
             item.Click += delegate
             {
-                AlignOrStack("top", surface, this[0], this);
+                PushOut("top", surface, this[0], this);
             };
             alignSubmenu.DropDownItems.Add(item);
 
             // Bottom
-            item = new ToolStripMenuItem("Stack on Bottom")
+            item = new ToolStripMenuItem("Bottom")
             {
-                Image = (Image)EditorFormResources.GetObject("removeObjectToolStripMenuItem.Image")
+                Image = (Image)EditorFormResources.GetObject("copyToolStripMenuItem.Image")
             };
-            // Action to perform on click.
             item.Click += delegate
             {
-                AlignOrStack("bottom", surface, this[0], this);
+                PushOut("bottom", surface, this[0], this);
             };
             alignSubmenu.DropDownItems.Add(item);
             menu.Items.Add(alignSubmenu);
@@ -661,9 +658,11 @@ namespace Greenshot.Editor.Drawing
             {
                 foreach (var item in this)
                 {
+                    MakeBoundsChangeUndoable(false);
                     item.Width = surface.Image.Width;
                 }
                 SnapAllToEdge("left", surface, this);
+                surface.Invalidate(); // not sure if this belongs
             };
             fitSubmenu.DropDownItems.Add(item);
 
@@ -676,9 +675,11 @@ namespace Greenshot.Editor.Drawing
             {
                 foreach (var item in this)
                 {
+                    MakeBoundsChangeUndoable(false);
                     item.Height = surface.Image.Height;
                 }
                 SnapAllToEdge("top", surface, this);
+                surface.Invalidate(); // not sure if this belongs
             };
             fitSubmenu.DropDownItems.Add(item);
             menu.Items.Add(fitSubmenu);
@@ -868,6 +869,7 @@ namespace Greenshot.Editor.Drawing
                 yMovement = -target.Location.Y;
             else if (direction == "bottom")
                 yMovement = surface.Image.Height - target.Location.Y - target.Height;
+            target.MakeBoundsChangeUndoable(false);
             target.MoveBy(xMovement, yMovement);
         }
 
@@ -880,7 +882,7 @@ namespace Greenshot.Editor.Drawing
             surface.DeselectAllElements();
         }
 
-        public void AlignOrStack(string direction, ISurface surface, IDrawableContainer target, IDrawableContainerList parent)
+        public void PushOut(string direction, ISurface surface, IDrawableContainer target, IDrawableContainerList parent)
         {
             // Make calculations
             int left = 0, right = 0, top = 0, bottom = 0;
diff --git a/src/Greenshot.Editor/Drawing/Surface.cs b/src/Greenshot.Editor/Drawing/Surface.cs
index b027ce427..984fa3e6d 100644
--- a/src/Greenshot.Editor/Drawing/Surface.cs
+++ b/src/Greenshot.Editor/Drawing/Surface.cs
@@ -1433,6 +1433,15 @@ namespace Greenshot.Editor.Drawing
             }
         }
 
+        public void RecordElementMoved()
+        {
+            if (!_isSurfaceMoveMadeUndoable)
+            {
+                _isSurfaceMoveMadeUndoable = true;
+                selectedElements.MakeBoundsChangeUndoable(false);
+            }
+        }
+
         /// <summary>
         /// This event handler is called when the surface is double clicked.
         /// </summary>