diff --git a/routers/web/repo/licenses.go b/routers/web/repo/licenses.go
index f3b4c0f7f5..78106ce40b 100644
--- a/routers/web/repo/licenses.go
+++ b/routers/web/repo/licenses.go
@@ -258,7 +258,12 @@ func LicensesRegenerateMasterKey(ctx *context.Context) {
 
 // LicensesGenerateKey handles POST to generate a new key from a package.
 func LicensesGenerateKey(ctx *context.Context) {
-	packageID, _ := strconv.ParseInt(ctx.FormString("package_id"), 10, 64)
+	// Accept package_id from form body or query string (modal sets it via form action URL).
+	pkgIDStr := ctx.FormString("package_id")
+	if pkgIDStr == "" {
+		pkgIDStr = ctx.Req.URL.Query().Get("package_id")
+	}
+	packageID, _ := strconv.ParseInt(pkgIDStr, 10, 64)
 	if packageID == 0 {
 		ctx.Flash.Error("Invalid package")
 		ctx.Redirect(ctx.Repo.RepoLink + "/licenses")
diff --git a/templates/repo/licenses.tmpl b/templates/repo/licenses.tmpl
index 217017853a..4744aa8d16 100644
--- a/templates/repo/licenses.tmpl
+++ b/templates/repo/licenses.tmpl
@@ -58,9 +58,7 @@
 									<td class="tw-text-right tw-flex tw-gap-1 tw-justify-end">
 										<button class="ui tiny primary button show-modal"
 											data-modal="#generate-key-modal"
-											data-modal-generate-key-modal-package-id="{{.ID}}"
-											data-modal-generate-key-modal-package-name="{{.Name}}"
-											data-modal-generate-key-modal-package-domain="{{.DomainRestriction}}"
+											data-modal-form.action="{{$.RepoLink}}/licenses/keys/generate?package_id={{.ID}}"
 											title="{{ctx.Locale.Tr "repo.licenses.generate_key"}}">
 											{{svg "octicon-plus" 14}}
 										</button>
@@ -321,7 +319,6 @@
 	<div class="content">
 		<form class="ui form" method="post" action="{{.RepoLink}}/licenses/keys/generate">
 			{{.CsrfTokenHtml}}
-			<input type="hidden" name="package_id" value="">
 			<div class="field">
 				<label>{{ctx.Locale.Tr "repo.licenses.licensee_name"}}</label>
 				<input name="licensee_name" placeholder="Customer name">