diff --git a/state/commands/align.ts b/state/commands/align.ts
index b79663834..bbfb7b22e 100644
--- a/state/commands/align.ts
+++ b/state/commands/align.ts
@@ -1,17 +1,19 @@
 import Command from "./command"
 import history from "../history"
 import { AlignType, Data } from "types"
-import { getPage } from "utils/utils"
+import { getCommonBounds, getPage, getSelectedShapes } from "utils/utils"
 import { getShapeUtils } from "lib/shape-utils"
 
 export default function alignCommand(data: Data, type: AlignType) {
   const { currentPageId } = data
-  const initialPoints = Object.fromEntries(
-    Object.entries(getPage(data).shapes).map(([id, shape]) => [
-      id,
-      [...shape.point],
-    ])
+  const selectedShapes = getSelectedShapes(data)
+  const entries = selectedShapes.map(
+    (shape) => [shape.id, getShapeUtils(shape).getBounds(shape)] as const
   )
+  const boundsForShapes = Object.fromEntries(entries)
+  const commonBounds = getCommonBounds(...entries.map((entry) => entry[1]))
+  const midX = commonBounds.minX + commonBounds.width / 2
+  const midY = commonBounds.minY + commonBounds.height / 2
 
   history.execute(
     data,
@@ -23,30 +25,76 @@ export default function alignCommand(data: Data, type: AlignType) {
 
         switch (type) {
           case AlignType.Top: {
+            for (let id in boundsForShapes) {
+              const shape = shapes[id]
+              getShapeUtils(shape).translateTo(shape, [
+                shape.point[0],
+                commonBounds.minY,
+              ])
+            }
             break
           }
           case AlignType.CenterVertical: {
+            for (let id in boundsForShapes) {
+              const shape = shapes[id]
+              getShapeUtils(shape).translateTo(shape, [
+                shape.point[0],
+                midY - boundsForShapes[id].height / 2,
+              ])
+            }
             break
           }
           case AlignType.Bottom: {
+            for (let id in boundsForShapes) {
+              const shape = shapes[id]
+              getShapeUtils(shape).translateTo(shape, [
+                shape.point[0],
+                commonBounds.maxY - boundsForShapes[id].height,
+              ])
+            }
             break
           }
           case AlignType.Left: {
+            for (let id in boundsForShapes) {
+              const shape = shapes[id]
+              getShapeUtils(shape).translateTo(shape, [
+                commonBounds.minX,
+                shape.point[1],
+              ])
+            }
             break
           }
           case AlignType.CenterHorizontal: {
+            for (let id in boundsForShapes) {
+              const shape = shapes[id]
+              getShapeUtils(shape).translateTo(shape, [
+                midX - boundsForShapes[id].width / 2,
+                shape.point[1],
+              ])
+            }
             break
           }
           case AlignType.Right: {
+            for (let id in boundsForShapes) {
+              const shape = shapes[id]
+              getShapeUtils(shape).translateTo(shape, [
+                commonBounds.maxX - boundsForShapes[id].width,
+                shape.point[1],
+              ])
+            }
             break
           }
         }
       },
       undo(data) {
         const { shapes } = getPage(data, currentPageId)
-        for (let id in initialPoints) {
+        for (let id in boundsForShapes) {
           const shape = shapes[id]
-          getShapeUtils(shape).translateTo(shape, initialPoints[id])
+          const initialBounds = boundsForShapes[id]
+          getShapeUtils(shape).translateTo(shape, [
+            initialBounds.minX,
+            initialBounds.minY,
+          ])
         }
       },
     })