diff --git a/templates/repo/issue/view_content/add_reaction.tmpl b/templates/repo/issue/view_content/add_reaction.tmpl
index 95778cc5b3..c02f2db6f9 100644
--- a/templates/repo/issue/view_content/add_reaction.tmpl
+++ b/templates/repo/issue/view_content/add_reaction.tmpl
@@ -1,5 +1,5 @@
 {{if .ctx.IsSigned}}
-<div class="item action ui pointing select-reaction dropdown" data-action-url="{{ .ActionURL }}">
+<div class="item action ui pointing select-reaction dropdown top right" data-action-url="{{ .ActionURL }}">
 	<a class="add-reaction">
 		{{svg "octicon-smiley"}}
 	</a>
diff --git a/templates/repo/issue/view_content/context_menu.tmpl b/templates/repo/issue/view_content/context_menu.tmpl
index 0b8b84e9f1..41786242ba 100644
--- a/templates/repo/issue/view_content/context_menu.tmpl
+++ b/templates/repo/issue/view_content/context_menu.tmpl
@@ -1,5 +1,5 @@
 {{if .ctx.IsSigned}}
-<div class="item action ui pointing custom dropdown context-dropdown">
+<div class="item action ui pointing custom dropdown top right context-dropdown">
 	<a class="context-menu">
 		{{svg "octicon-kebab-horizontal"}}
 	</a>
diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index 10786b9058..6b16143bb1 100644
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -1784,7 +1784,7 @@ a.ui.basic.label:hover {
 }
 
 /* fix misaligned right buttons on box headers */
-.ui.attached.header .right {
+.ui.attached.header .right:not(.dropdown) {
   position: absolute;
   right: .78571429rem;
   top: 0;