diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index df58c6fc..1e6cfa5e 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -345,8 +345,9 @@ function svg_edit_setup() {
 	}
 
 	var clickClear = function(){
-		if( confirm('Do you want to clear the drawing?') ) {
+		if( confirm('Do you want to clear the drawing?\nThis will also erase your undo history!') ) {
 			svgCanvas.clear();
+			updateContextPanel();
 		}
 	}
 
diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index f1631622..cfd0568b 100644
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -1202,6 +1202,10 @@ function SvgCanvas(c)
 				i++;
 			}
 		}
+		// clear the undo stack
+		console.log(undoStack);
+		resetUndoStack();
+		console.log(undoStack);
 		call("cleared");
 	};
 
@@ -1438,6 +1442,11 @@ function SvgCanvas(c)
 		}
 	};
 
+	var resetUndoStack = function() {
+		undoStack = [];
+		undoStackPointer = 0;
+	};
+	
 	this.getUndoStackSize = function() { return undoStackPointer; }
 	this.getRedoStackSize = function() { return undoStack.length - undoStackPointer; }