diff --git a/app/assets/javascripts/discourse/views/post_menu_view.js b/app/assets/javascripts/discourse/views/post_menu_view.js
index 3a8dfe68b6d..c99f30d1779 100644
--- a/app/assets/javascripts/discourse/views/post_menu_view.js
+++ b/app/assets/javascripts/discourse/views/post_menu_view.js
@@ -229,11 +229,9 @@ Discourse.PostMenuView = Discourse.View.extend({
       return;
     }
 
-    buffer.push('<button title="' + I18n.t("post.controls.admin") + '" data-action="admin" class="admin"><i class="fa fa-wrench"></i>');
+    buffer.push('<button title="' + I18n.t("post.controls.admin") + '" data-action="admin" class="admin"><i class="fa fa-wrench"></i></button>');
 
     this.renderAdminPopup(post, buffer);
-
-    buffer.push('</button>');
   },
 
   renderAdminPopup: function(post, buffer) {
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index ab486147190..2324a902541 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -98,6 +98,10 @@ section.post-menu-area, .post-actions {
     }
 }
 
+section.post-menu-area {
+  position: relative;
+}
+
 nav.post-controls {
     padding: 0;
     button {
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index f295cacb6cf..52f0fb18b2b 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -83,6 +83,10 @@ button {
   }
 }
 
+nav.post-controls {
+  position: relative;
+}
+
 .post-admin-menu {
   background-color: $secondary;
   width: 205px;
@@ -90,7 +94,7 @@ button {
   border: 1px solid scale-color-diff();
   position: absolute;
   text-align: left;
-  bottom: 0;
+  bottom: -26px;
   left: 0;
   z-index: 1000;
   display: none;