diff --git a/client/components/codeEditor/customKeyMap.js b/client/components/codeEditor/customKeyMap.js
index 07dae0e6d..93760d7d0 100644
--- a/client/components/codeEditor/customKeyMap.js
+++ b/client/components/codeEditor/customKeyMap.js
@@ -1,4 +1,5 @@
 import { keymap } from '@codemirror/view';
+import { undo, redo } from '@codemirror/commands';
 
 const indentMore = (view)=>{
 	const { from, to } = view.state.selection.main;
@@ -221,4 +222,6 @@ export const customKeymap = keymap.of([
 	{ key: 'Shift-Mod-6', run: makeHeader(6) },
 	{ key: 'Shift-Mod-Enter', run: newColumn },
 	{ key: 'Mod-Enter', run: newPage },
+	{ key: 'Mod-z', run: undo }, //i think it may be unnecessary
+	{ key: 'Mod-Shift-z', run: redo },
 ]);
diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx
index 2ecab8834..4af60b9bd 100644
--- a/client/homebrew/editor/snippetbar/snippetbar.jsx
+++ b/client/homebrew/editor/snippetbar/snippetbar.jsx
@@ -241,11 +241,11 @@ const Snippetbar = createReactClass({
 						<i className='fas fa-clock-rotate-left' />
 						{ this.state.showHistory && this.renderHistoryItems() }
 					</div>
-					<div className={`editorTool undo ${this.props.historySize.undo ? 'active' : ''}`}
+					<div className={`editorTool undo ${this.props.historySize.done ? 'active' : ''}`}
 						onClick={this.props.undo} >
 						<i className='fas fa-undo' />
 					</div>
-					<div className={`editorTool redo ${this.props.historySize.redo ? 'active' : ''}`}
+					<div className={`editorTool redo ${this.props.historySize.undone ? 'active' : ''}`}
 						onClick={this.props.redo} >
 						<i className='fas fa-redo' />
 					</div>