diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
index 03d49fa692..24785d867e 100644
--- a/routers/web/repo/compare.go
+++ b/routers/web/repo/compare.go
@@ -231,6 +231,13 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo {
 	if infoPath == "" {
 		infos = []string{baseRepo.DefaultBranch, baseRepo.DefaultBranch}
 	} else {
+		infoPath, isDiff := strings.CutSuffix(infoPath, ".diff")
+		ctx.Data["ComparingDiff"] = isDiff
+		if !isDiff {
+			var isPatch bool
+			infoPath, isPatch = strings.CutSuffix(infoPath, ".patch")
+			ctx.Data["ComparingPatch"] = isPatch
+		}
 		infos = strings.SplitN(infoPath, "...", 2)
 		if len(infos) != 2 {
 			if infos = strings.SplitN(infoPath, "..", 2); len(infos) == 2 {
@@ -717,6 +724,22 @@ func CompareDiff(ctx *context.Context) {
 		return
 	}
 
+	if ctx.Data["ComparingDiff"] != nil && ctx.Data["ComparingDiff"].(bool) {
+		err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch, git.RawDiffNormal, "", ctx.Resp)
+		if err != nil {
+			ctx.ServerError("ComparingDiff", err)
+			return
+		}
+	}
+
+	if ctx.Data["ComparingPatch"] != nil && ctx.Data["ComparingPatch"].(bool) {
+		err := git.GetRepoRawDiffForFile(ci.HeadGitRepo, ci.BaseBranch, ci.HeadBranch, git.RawDiffPatch, "", ctx.Resp)
+		if err != nil {
+			ctx.ServerError("ComparingPatch", err)
+			return
+		}
+	}
+
 	ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes
 	ctx.Data["DirectComparison"] = ci.DirectComparison
 	ctx.Data["OtherCompareSeparator"] = ".."
@@ -802,7 +825,8 @@ func CompareDiff(ctx *context.Context) {
 	if ci.DirectComparison {
 		separator = ".."
 	}
-	ctx.Data["Title"] = "Comparing " + base.ShortSha(beforeCommitID) + separator + base.ShortSha(afterCommitID)
+	ctx.Data["Comparing"] = base.ShortSha(beforeCommitID) + separator + base.ShortSha(afterCommitID)
+	ctx.Data["Title"] = "Comparing " + ctx.Data["Comparing"].(string)
 
 	ctx.Data["IsDiffCompare"] = true
 	_, templateErrs := setTemplateIfExists(ctx, pullRequestTemplateKey, pullRequestTemplateCandidates)
diff --git a/templates/repo/diff/options_dropdown.tmpl b/templates/repo/diff/options_dropdown.tmpl
index 09b7b80e41..97dc3ba940 100644
--- a/templates/repo/diff/options_dropdown.tmpl
+++ b/templates/repo/diff/options_dropdown.tmpl
@@ -11,6 +11,9 @@
 		{{else if .Commit.ID.String}}
 			<a class="item" href="{{$.RepoLink}}/commit/{{PathEscape .Commit.ID.String}}.patch" download="{{ShortSha .Commit.ID.String}}.patch">{{ctx.Locale.Tr "repo.diff.download_patch"}}</a>
 			<a class="item" href="{{$.RepoLink}}/commit/{{PathEscape .Commit.ID.String}}.diff" download="{{ShortSha .Commit.ID.String}}.diff">{{ctx.Locale.Tr "repo.diff.download_diff"}}</a>
+		{{else if .Diff}}
+			<a class="item" href="{{$.RepoLink}}/compare/{{.Comparing}}.patch" download="{{.Comparing}}.patch">{{ctx.Locale.Tr "repo.diff.download_patch"}}</a>
+			<a class="item" href="{{$.RepoLink}}/compare/{{.Comparing}}.diff" download="{{.Comparing}}.diff">{{ctx.Locale.Tr "repo.diff.download_diff"}}</a>
 		{{end}}
 		<a id="expand-files-btn" class="item">{{ctx.Locale.Tr "repo.pulls.expand_files"}}</a>
 		<a id="collapse-files-btn" class="item">{{ctx.Locale.Tr "repo.pulls.collapse_files"}}</a>
diff --git a/tests/integration/compare_test.go b/tests/integration/compare_test.go
index 2d27a430ac..d134ebf40a 100644
--- a/tests/integration/compare_test.go
+++ b/tests/integration/compare_test.go
@@ -23,6 +23,7 @@ import (
 	files_service "code.gitea.io/gitea/services/repository/files"
 	"code.gitea.io/gitea/tests"
 
+	"github.com/PuerkitoBio/goquery"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -67,6 +68,114 @@ func inspectCompare(t *testing.T, htmlDoc *HTMLDoc, diffCount int, diffChanges [
 	}
 }
 
+func TestComparePatchAndDiffMenuEntries(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	session := loginUser(t, "user2")
+	req := NewRequest(t, "GET", "/user2/repo-release/compare/v1.0...v2.0")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+	downloadOptions := htmlDoc.doc.Find("a.item[download]")
+	var patchDownloadEntryPresent bool
+	var diffDownloadEntryPresent bool
+	downloadOptions.Each(func(idx int, c *goquery.Selection) {
+		value, exists := c.Attr("download")
+		if exists && strings.HasSuffix(value, ".patch") {
+			patchDownloadEntryPresent = true
+		}
+
+		if exists && strings.HasSuffix(value, ".diff") {
+			diffDownloadEntryPresent = true
+		}
+	})
+
+	assert.True(t, patchDownloadEntryPresent, "Patch file download entry should be present")
+	assert.True(t, diffDownloadEntryPresent, "Diff file download entry should be present")
+}
+
+func TestComparePatchDownload(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	session := loginUser(t, "user2")
+	req := NewRequest(t, "GET", "/user2/repo-release/compare/v1.0...v2.0.patch")
+	attendedResponse := `From 4380f99290b2b3922733ff82c57afad915ace907 Mon Sep 17 00:00:00 2001
+From: user1 <address1@example.com>
+Date: Mon, 17 Apr 2023 14:39:35 +0200
+Subject: [PATCH 1/3] feature v2
+
+---
+ feature | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 feature
+
+diff --git a/feature b/feature
+new file mode 100644
+index 0000000..e69de29
+
+From 79f9d88f1b054d650f88da0bd658e21f7b0cf6ec Mon Sep 17 00:00:00 2001
+From: user1 <address1@example.com>
+Date: Mon, 17 Apr 2023 14:38:53 +0200
+Subject: [PATCH 2/3] bugfix
+
+---
+ bugfix | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bugfix
+
+diff --git a/bugfix b/bugfix
+new file mode 100644
+index 0000000..e69de29
+
+From 7197b56fdc75b453f47c9110938cb46a303579fd Mon Sep 17 00:00:00 2001
+From: user1 <address1@example.com>
+Date: Mon, 17 Apr 2023 14:42:34 +0200
+Subject: [PATCH 3/3] readme: v2
+
+---
+ README.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/README.md b/README.md
+index 6dfe48a..bc7068d 100644
+--- a/README.md
++++ b/README.md
+@@ -1,3 +1,3 @@
+ # Releases test repo
+ 
+-With a v1.0
++With a v1.0 and a v2.0
+`
+
+	resp := session.MakeRequest(t, req, http.StatusOK)
+	assert.Equal(t, attendedResponse, resp.Body.String())
+}
+
+func TestCompareDiffDownload(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	session := loginUser(t, "user2")
+	req := NewRequest(t, "GET", "/user2/repo-release/compare/v1.0...v2.0.diff")
+	attendedResponse := `diff --git a/README.md b/README.md
+index 6dfe48a..bc7068d 100644
+--- a/README.md
++++ b/README.md
+@@ -1,3 +1,3 @@
+ # Releases test repo
+ 
+-With a v1.0
++With a v1.0 and a v2.0
+diff --git a/bugfix b/bugfix
+new file mode 100644
+index 0000000..e69de29
+diff --git a/feature b/feature
+new file mode 100644
+index 0000000..e69de29
+`
+
+	resp := session.MakeRequest(t, req, http.StatusOK)
+	assert.Equal(t, attendedResponse, resp.Body.String())
+}
+
 // Git commit graph for repo20
 // * 8babce9 (origin/remove-files-b) Add a dummy file
 // * b67e43a Delete test.csv and link_hi