diff --git a/src/components/UI/BottomBar/index.jsx b/src/components/UI/BottomBar/index.jsx
index 986ae9b..00fbde1 100644
--- a/src/components/UI/BottomBar/index.jsx
+++ b/src/components/UI/BottomBar/index.jsx
@@ -4,6 +4,7 @@ import { TrashIcon, ResetIcon } from "@radix-ui/react-icons";
 import "./styles.css";
 import { useStore } from "../../../store";
 import { PopoverPeopleList } from "../PeopleList";
+import { useUndoRedoShortcut } from "../../../utils";
 // import { EDIT_MODE } from "../../../utils";
 
 export const BottomBar = () => {
@@ -51,6 +52,8 @@ export const BottomBar = () => {
     setSelection({});
   };
 
+  useUndoRedoShortcut(undo, redo);
+
   return (
     <div className="BottomBar">
       <button className="Button violet" onClick={undo}>
diff --git a/src/utils/hooks.js b/src/utils/hooks.js
index 60adb9d..6132e51 100644
--- a/src/utils/hooks.js
+++ b/src/utils/hooks.js
@@ -78,3 +78,19 @@ export const useDeleteShortcut = (selected, setBricks, onDelete) => {
 
   return null;
 };
+
+export const useUndoRedoShortcut = (undo, redo) => {
+  useKeyboardShortcut(["Control", "Z"], undo, {
+    overrideSystem: true,
+    ignoreInputFields: false,
+    repeatOnHold: false,
+  });
+
+  useKeyboardShortcut(["Control", "R"], redo, {
+    overrideSystem: true,
+    ignoreInputFields: false,
+    repeatOnHold: false,
+  });
+
+  return null;
+};