diff --git a/cmd/micro/eventhandler.go b/cmd/micro/eventhandler.go
index 2c5076d1..2e182c4c 100644
--- a/cmd/micro/eventhandler.go
+++ b/cmd/micro/eventhandler.go
@@ -117,6 +117,8 @@ func (eh *EventHandler) Undo() {
 
 		if startTime-(te.time.UnixNano()/int64(time.Millisecond)) > undoThreshold {
 			return
+		} else {
+			startTime = t.(*TextEvent).time.UnixNano() / int64(time.Millisecond)
 		}
 
 		eh.UndoOneEvent()
diff --git a/cmd/micro/settings.go b/cmd/micro/settings.go
index a9b1d358..4784da79 100644
--- a/cmd/micro/settings.go
+++ b/cmd/micro/settings.go
@@ -72,17 +72,17 @@ func GetOption(name string) interface{} {
 // DefaultSettings returns the default settings for micro
 func DefaultSettings() map[string]interface{} {
 	return map[string]interface{}{
-		"colorscheme":  "default",
-		"tabsize":      float64(4),
-		"indentchar":   " ",
-		"ignorecase":   false,
 		"autoindent":   true,
-		"syntax":       true,
-		"tabstospaces": false,
+		"colorscheme":  "default",
+		"ignorecase":   false,
+		"indentchar":   " ",
 		"ruler":        true,
-		"statusline":   true,
-		"scrollmargin": float64(3),
 		"scrollspeed":  float64(2),
+		"scrollmargin": float64(3),
+		"statusline":   true,
+		"syntax":       true,
+		"tabsize":      float64(4),
+		"tabstospaces": false,
 	}
 }