diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index e1881b1d94..b653fc0c2c 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -108,7 +108,7 @@
 						<span class="help">{{ctx.Locale.Tr "repo.release.hide_archive_links_helper"}}</span>
 					{{end}}
 					<div class="divider tw-mt-0"></div>
-					<div class="tw-flex tw-justify-end">
+					<div class="tw-flex tw-justify-end button-row">
 						{{if .PageIsEditRelease}}
 							<a class="ui small button" href="{{.RepoLink}}/releases">
 								{{ctx.Locale.Tr "repo.release.cancel"}}
diff --git a/templates/repo/release_tag_header.tmpl b/templates/repo/release_tag_header.tmpl
index f4eeb532e0..dafe9f2fa6 100644
--- a/templates/repo/release_tag_header.tmpl
+++ b/templates/repo/release_tag_header.tmpl
@@ -11,16 +11,18 @@
 				{{end}}
 			</h2>
 		</div>
-		{{if .EnableFeed}}
-			<a class="ui small button" href="{{.RepoLink}}/{{if .PageIsTagList}}tags{{else}}releases{{end}}.rss">
-				{{svg "octicon-rss" 16}} {{ctx.Locale.Tr "rss_feed"}}
-			</a>
-		{{end}}
-		{{if and (not .PageIsTagList) .CanCreateRelease}}
-			<a class="ui small primary button" href="{{$.RepoLink}}/releases/new">
-				{{ctx.Locale.Tr "repo.release.new_release"}}
-			</a>
-		{{end}}
+		<div class="button-row">
+			{{if .EnableFeed}}
+				<a class="ui small button" href="{{.RepoLink}}/{{if .PageIsTagList}}tags{{else}}releases{{end}}.rss">
+					{{svg "octicon-rss" 16}} {{ctx.Locale.Tr "rss_feed"}}
+				</a>
+			{{end}}
+			{{if and (not .PageIsTagList) .CanCreateRelease}}
+				<a class="ui small primary button" href="{{$.RepoLink}}/releases/new">
+					{{ctx.Locale.Tr "repo.release.new_release"}}
+				</a>
+			{{end}}
+		</div>
 	</div>
 	<div class="divider"></div>
 {{else if $canReadCode}}
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index e4f8cce8b4..e90e0ec4fe 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -601,7 +601,8 @@ td .commit-summary {
   align-items: center;
 }
 
-.repository.view.issue .button-row {
+.repository.view.issue .button-row,
+.repository.releases .button-row {
   display: flex;
 }