diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index fdcf1b8193..dc336700b6 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -141,20 +141,20 @@
 					{{template "repo/cite/cite_modal" .}}
 				{{end}}
 				{{if and (not $isHomepage) (not .IsViewFile) (not .IsBlame)}}{{/* IsViewDirectory (not home), TODO: split the templates, avoid using "if" tricks */}}
-					<a class="ui button" href="{{.RepoLink}}/commits/{{.BranchNameSubURL}}/{{.TreePath | PathEscapeSegments}}">
-						{{svg "octicon-history" 16 "tw-mr-2"}}{{ctx.Locale.Tr "repo.file_history"}}
-					</a>
-					{{if not $.DisableDownloadSourceArchives}}
-						<div class="clone-panel ui action tiny input">
-							<button class="ui small jump dropdown icon button" data-tooltip-content="{{ctx.Locale.Tr "repo.more_operations"}}">
+					<div class="button-row folder-actions">
+						<a class="ui button" href="{{.RepoLink}}/commits/{{.BranchNameSubURL}}/{{.TreePath | PathEscapeSegments}}">
+							{{svg "octicon-history" 16 "tw-mr-2"}}{{ctx.Locale.Tr "repo.file_history"}}
+						</a>
+						{{if not $.DisableDownloadSourceArchives}}
+							<button class="ui jump dropdown icon button" data-tooltip-content="{{ctx.Locale.Tr "repo.more_operations"}}">
 								{{svg "octicon-kebab-horizontal"}}
 								<div class="menu">
 									<a class="item archive-link" href="{{$.RepoLink}}/archive/{{PathEscapeSegments (printf "%s:%s" $.RefName .TreePath)}}.zip" rel="nofollow">{{svg "octicon-file-zip" 16 "tw-mr-2"}}{{ctx.Locale.Tr "repo.download_zip"}}</a>
 									<a class="item archive-link" href="{{$.RepoLink}}/archive/{{PathEscapeSegments (printf "%s:%s" $.RefName .TreePath)}}.tar.gz" rel="nofollow">{{svg "octicon-file-zip" 16 "tw-mr-2"}}{{ctx.Locale.Tr "repo.download_tar"}}</a>
 								</div>
 							</button>
-						</div>
-					{{end}}
+						{{end}}
+					</div>
 				{{end}}
 			</div>
 		</div>
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index 4e07d9d9e3..a9720ec6da 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -153,7 +153,9 @@
   border-radius: 0 var(--border-radius) var(--border-radius) 0 !important;
 }
 
-.repository .clone-panel .dropdown .menu {
+/* Dropdown alignment */
+.repository .clone-panel .dropdown .menu,
+.repository .folder-actions .dropdown .menu {
   right: 0 !important;
   left: auto !important;
 }