diff --git a/src/index.html b/src/index.html
index 8cafec1..1405985 100644
--- a/src/index.html
+++ b/src/index.html
@@ -222,7 +222,9 @@
 							><span>remove selected</span> <kbd>Menu, Shift+F10, `</kbd
 							><span>context menu</span><kbd>Ctrl+A</kbd><span>select all</span
 							><kbd>Shift + ↑ / ↓</kbd><span>extend selection</span>
-							<kbd>Esc</kbd><span>clear selection</span>
+							<kbd>Esc</kbd><span>clear selection</span> <kbd>Ctrl+Z</kbd
+							><span>undo last queue change</span> <kbd>Ctrl+Y</kbd
+							><span>redo queue change</span>
 						</div>
 					</div>
 				</div>
@@ -328,6 +330,8 @@
 		<script src="js/ui.js"></script>
 		<script src="js/state.js"></script>
 		<script src="js/api.js"></script>
+		<script src="js/stack.js"></script>
+		<script src="js/history.js"></script>
 		<script src="js/queue-virtualscroll.js"></script>
 		<script src="js/queue.js"></script>
 		<script src="js/library-selection.js"></script>
diff --git a/src/js/input.js b/src/js/input.js
index d46899b..944c455 100644
--- a/src/js/input.js
+++ b/src/js/input.js
@@ -454,6 +454,26 @@ function setupKeyboardShortcuts() {
 				}
 				break;
 			}
+
+			case "KeyZ": {
+				// undo: Ctrl+Z
+				if (e.ctrlKey || e.metaKey) {
+					e.preventDefault();
+					const snapshot = history.undo(snapshotQueue());
+					restoreQueue(snapshot);
+				}
+				break;
+			}
+
+			case "KeyY": {
+				// redo: Ctrl+Y
+				if (e.ctrlKey || e.metaKey) {
+					e.preventDefault();
+					const snapshot = history.redo(snapshotQueue());
+					restoreQueue(snapshot);
+				}
+				break;
+			}
 		}
 	});
 }