diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl
index 24d3857a5f..411728ef28 100644
--- a/templates/base/footer_content.tmpl
+++ b/templates/base/footer_content.tmpl
@@ -17,17 +17,17 @@
 		{{end}}
 	</div>
 	<div class="right-links" role="group" aria-label="{{ctx.Locale.Tr "aria.footer.links"}}">
+		{{if .TermsOfServiceURL}}<a href="{{.TermsOfServiceURL}}">{{ctx.Locale.Tr "terms_of_service"}}</a>{{end}}
+		{{if .PrivacyPolicyURL}}<a href="{{.PrivacyPolicyURL}}">{{ctx.Locale.Tr "privacy_policy"}}</a>{{end}}
+		<a href="{{AssetUrlPrefix}}/licenses.txt">{{ctx.Locale.Tr "licenses"}}</a>
+		{{template "custom/extra_links_footer" .}}
 		<div class="ui dropdown upward language">
-			<span class="flex-text-inline">{{svg "octicon-globe" 14}} {{ctx.Locale.LangName}}</span>
-			<div class="menu language-menu">
+			<span class="flex-text-inline">{{svg "octicon-globe" 14}}</span>
+			<div class="menu language-menu left">
 				{{range .AllLangs}}
 					<a lang="{{.Lang}}" data-url="{{AppSubUrl}}/?lang={{.Lang}}" class="item {{if eq ctx.Locale.Lang .Lang}}active selected{{end}}">{{.Name}}</a>
 				{{end}}
 			</div>
 		</div>
-		{{if .TermsOfServiceURL}}<a href="{{.TermsOfServiceURL}}">{{ctx.Locale.Tr "terms_of_service"}}</a>{{end}}
-		{{if .PrivacyPolicyURL}}<a href="{{.PrivacyPolicyURL}}">{{ctx.Locale.Tr "privacy_policy"}}</a>{{end}}
-		<a href="{{AssetUrlPrefix}}/licenses.txt">{{ctx.Locale.Tr "licenses"}}</a>
-		{{template "custom/extra_links_footer" .}}
 	</div>
 </footer>
diff --git a/web_src/css/home.css b/web_src/css/home.css
index 84dd793612..5498203a00 100644
--- a/web_src/css/home.css
+++ b/web_src/css/home.css
@@ -60,7 +60,6 @@
 }
 
 .page-footer .right-links {
-  min-width: 180px; /* make sure the menu dropdown doesn't overflow horizontally when language name is short */
   display: flex;
   flex-wrap: wrap;
   align-items: center;
@@ -68,12 +67,13 @@
 }
 
 .page-footer .right-links > a {
-  border-left: 1px solid var(--color-secondary-dark-1);
-  padding-left: 8px;
-  margin-left: 8px;
+  border-right: 1px solid var(--color-secondary-dark-1);
+  padding-right: 8px;
+  margin-right: 8px;
 }
 
 .page-footer .ui.dropdown.language .menu {
+  margin-right: -16px;
   max-height: min(500px, calc(100vh - 60px));
   overflow-y: auto;
   margin-bottom: 10px;