diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index 239ae527a..9cb5a6717 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -732,6 +732,7 @@ LEVEL = Info
 ;CLONE = 300
 ;PULL = 300
 ;GC = 60
+;GREP = 2
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Git config options
diff --git a/modules/git/grep.go b/modules/git/grep.go
index 4bded8a9c..8c2cfd54b 100644
--- a/modules/git/grep.go
+++ b/modules/git/grep.go
@@ -15,6 +15,7 @@ import (
 	"os"
 	"strconv"
 	"strings"
+	"time"
 
 	"code.gitea.io/gitea/modules/setting"
 )
@@ -94,6 +95,8 @@ func GrepSearch(ctx context.Context, repo *Repository, search string, opts GrepO
 	opts.MaxResultLimit = cmp.Or(opts.MaxResultLimit, 50)
 	stderr := bytes.Buffer{}
 	err = cmd.Run(&RunOpts{
+		Timeout: time.Duration(setting.Git.Timeout.Grep) * time.Second,
+
 		Dir:    repo.Path,
 		Stdout: stdoutWriter,
 		Stderr: &stderr,
diff --git a/modules/setting/git.go b/modules/setting/git.go
index 48a4e7f30..812c4fe6c 100644
--- a/modules/setting/git.go
+++ b/modules/setting/git.go
@@ -37,6 +37,7 @@ var Git = struct {
 		Clone   int
 		Pull    int
 		GC      int `ini:"GC"`
+		Grep    int
 	} `ini:"git.timeout"`
 }{
 	DisableDiffHighlight:      false,
@@ -59,6 +60,7 @@ var Git = struct {
 		Clone   int
 		Pull    int
 		GC      int `ini:"GC"`
+		Grep    int
 	}{
 		Default: 360,
 		Migrate: 600,
@@ -66,6 +68,7 @@ var Git = struct {
 		Clone:   300,
 		Pull:    300,
 		GC:      60,
+		Grep:    2,
 	},
 }