diff --git a/cmd/micro/settings.go b/cmd/micro/settings.go
index 79f52269..00adac31 100644
--- a/cmd/micro/settings.go
+++ b/cmd/micro/settings.go
@@ -105,6 +105,15 @@ func SetOption(view *View, args []string) {
 					messenger.Error("Invalid value for " + option)
 					return
 				}
+			} else if option == "autoindent" {
+				if value == "on" {
+					settings.AutoIndent = true
+				} else if value == "off" {
+					settings.AutoIndent = false
+				} else {
+					messenger.Error("Invalid value for " + option)
+					return
+				}
 			} else if option == "ruler" {
 				if value == "on" {
 					settings.Ruler = true