diff --git a/assets/js/src/form_editor/components/history_redo.tsx b/assets/js/src/form_editor/components/history_redo.tsx
new file mode 100644
index 0000000000..3f5b720244
--- /dev/null
+++ b/assets/js/src/form_editor/components/history_redo.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { __ } from '@wordpress/i18n';
+import { Button } from '@wordpress/components';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { redo as redoIcon } from '@wordpress/icons';
+
+function HistoryRedo(props) {
+  const hasRedo = useSelect(
+    (select) => select('mailpoet-form-editor').hasEditorRedo(),
+    []
+  );
+  const { historyMove } = useDispatch('mailpoet-form-editor');
+  const redoAction = () => {
+    historyMove('redo');
+  };
+  return (
+    <Button
+      {...props}
+      icon={redoIcon}
+      label={__('Redo')}
+      aria-disabled={!hasRedo}
+      onClick={hasRedo ? redoAction : undefined}
+      className="editor-history__redo"
+    />
+  );
+}
+
+export default HistoryRedo;
diff --git a/assets/js/src/form_editor/components/history_undo.tsx b/assets/js/src/form_editor/components/history_undo.tsx
new file mode 100644
index 0000000000..e891987ad0
--- /dev/null
+++ b/assets/js/src/form_editor/components/history_undo.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { __ } from '@wordpress/i18n';
+import { Button } from '@wordpress/components';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { undo as undoIcon } from '@wordpress/icons';
+
+function HistoryUndo(props) {
+  const hasUndo = useSelect(
+    (select) => select('mailpoet-form-editor').hasEditorUndo(),
+    []
+  );
+  const { historyMove } = useDispatch('mailpoet-form-editor');
+  const undoAction = () => {
+    historyMove('undo');
+  };
+  return (
+    <Button
+      {...props}
+      icon={undoIcon}
+      label={__('Undo')}
+      aria-disabled={!hasUndo}
+      onClick={hasUndo ? undoAction : undefined}
+      className="editor-history__undo"
+    />
+  );
+}
+
+export default HistoryUndo;