diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 8542392..0bd4079 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -1,4 +1,5 @@
-import { useEffect, useState, useRef } from 'react';
+import { useCallback, useEffect, useState, useRef } from 'react';
+import { useStore } from 'zustand';
 import { useEditorStore } from './store/editorStore';
 import VideoPlayer from './components/VideoPlayer';
 import TranscriptEditor from './components/TranscriptEditor';
@@ -16,6 +17,8 @@ import {
   Loader2,
   FolderSearch,
   FileInput,
+  Undo2,
+  Redo2,
 } from 'lucide-react';
 
 const IS_ELECTRON = !!window.electronAPI;
@@ -35,6 +38,15 @@ export default function App() {
     backendUrl,
   } = useEditorStore();
 
+  const { pastStates, futureStates } = useStore(useEditorStore.temporal, (s) => ({
+    pastStates: s.pastStates,
+    futureStates: s.futureStates,
+  }));
+  const canUndo = pastStates.length > 0;
+  const canRedo = futureStates.length > 0;
+  const handleUndo = useCallback(() => useEditorStore.temporal.getState().undo(), []);
+  const handleRedo = useCallback(() => useEditorStore.temporal.getState().redo(), []);
+
   const [activePanel, setActivePanel] = useState<Panel>(null);
   const [manualPath, setManualPath] = useState('');
   const [whisperModel, setWhisperModel] = useState('base');
@@ -208,6 +220,18 @@ export default function App() {
             label="Open"
             onClick={IS_ELECTRON ? handleOpenFile : () => useEditorStore.getState().reset()}
           />
+          <ToolbarButton
+            icon={<Undo2 className="w-4 h-4" />}
+            label="Undo"
+            onClick={handleUndo}
+            disabled={!canUndo}
+          />
+          <ToolbarButton
+            icon={<Redo2 className="w-4 h-4" />}
+            label="Redo"
+            onClick={handleRedo}
+            disabled={!canRedo}
+          />
           <ToolbarButton
             icon={<Sparkles className="w-4 h-4" />}
             label="AI"
diff --git a/frontend/src/store/editorStore.ts b/frontend/src/store/editorStore.ts
index ec9448d..e1cb456 100644
--- a/frontend/src/store/editorStore.ts
+++ b/frontend/src/store/editorStore.ts
@@ -227,6 +227,14 @@ export const useEditorStore = create<EditorState & EditorActions>()(
 
       reset: () => set(initialState),
     }),
-    { limit: 100 },
+    {
+      limit: 100,
+      partialize: (state) => ({
+        words: state.words,
+        deletedRanges: state.deletedRanges,
+        segments: state.segments,
+        language: state.language,
+      }),
+    },
   ),
 );