diff --git a/routers/repo/setting.go b/routers/repo/setting.go
index 015c42c16..6ccd058a3 100644
--- a/routers/repo/setting.go
+++ b/routers/repo/setting.go
@@ -499,6 +499,7 @@ func SettingsGitHooks(ctx *context.Context) {
 func SettingsGitHooksEdit(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("repo.settings.githooks")
 	ctx.Data["PageIsSettingsGitHooks"] = true
+	ctx.Data["RequireSimpleMDE"] = true
 
 	name := ctx.Params(":name")
 	hook, err := ctx.Repo.GitRepo.GetHook(name)
@@ -530,7 +531,7 @@ func SettingsGitHooksEditPost(ctx *context.Context) {
 		ctx.Handle(500, "hook.Update", err)
 		return
 	}
-	ctx.Redirect(ctx.Repo.RepoLink + "/settings/hooks/git")
+	ctx.Redirect(ctx.Data["Link"].(string))
 }
 
 func SettingsDeployKeys(ctx *context.Context) {
diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl
index d139fd3f3..807c590dc 100644
--- a/templates/repo/settings/githook_edit.tmpl
+++ b/templates/repo/settings/githook_edit.tmpl
@@ -16,11 +16,11 @@
 						{{with .Hook}}
 							<div class="inline field">
 								<label>{{$.i18n.Tr "repo.settings.githook_name"}}</label>
-								<span>{{.Name}}</span>
+								<span><code>{{.Name}}</code></span>
 							</div>
 							<div class="field">
 								<label for="content">{{$.i18n.Tr "repo.settings.githook_content"}}</label>
-								<textarea id="content" name="content" rows="20" wrap="off" autofocus>{{if .IsActive}}{{.Content}}{{else}}{{.Sample}}{{end}}</textarea>
+								<textarea id="content" name="content" wrap="off" autofocus>{{if .IsActive}}{{.Content}}{{else}}{{.Sample}}{{end}}</textarea>
 							</div>
 
 							<div class="inline field">
@@ -33,4 +33,12 @@
 		</div>
 	</div>
 </div>
+
+<script>
+	CodeMirror.autoLoadMode(CodeMirror.fromTextArea($('#content')[0], {
+		lineNumbers: true,
+		mode: 'shell'
+	}), "shell");
+</script>
+
 {{template "base/footer" .}}