diff --git a/app/assets/javascripts/discourse/views/post_menu_view.js b/app/assets/javascripts/discourse/views/post_menu_view.js
index 366c66077d2..acabb0cd716 100644
--- a/app/assets/javascripts/discourse/views/post_menu_view.js
+++ b/app/assets/javascripts/discourse/views/post_menu_view.js
@@ -12,11 +12,11 @@ Discourse.PostMenuView = Discourse.View.extend({
 
   render: function(buffer) {
     var post = this.get('post');
-    this.renderReplies(post, buffer);
     buffer.push("<nav class='post-controls'>");
+    this.renderReplies(post, buffer);
 
     var postMenuView = this;
-    Discourse.get('postButtons').forEach(function(button) {
+    Discourse.get('postButtons').toArray().reverse().forEach(function(button) {
       var renderer = "render" + button;
       if(postMenuView[renderer]) postMenuView[renderer](post, buffer);
     });
diff --git a/app/assets/stylesheets/application/topic-post.css.scss b/app/assets/stylesheets/application/topic-post.css.scss
index 25bfc894447..b3e1f07b28e 100644
--- a/app/assets/stylesheets/application/topic-post.css.scss
+++ b/app/assets/stylesheets/application/topic-post.css.scss
@@ -258,7 +258,6 @@
     @include box-shadow(inset 0 -4px 4px -4px rgba($black, 0.14));
     nav.post-controls {
       @include unselectable;
-      float: right;
       padding: 0px;
       button {
         border: none;
@@ -280,6 +279,9 @@
         &.hidden {
           display: none;
         }
+        &.like, &.edit, &.flag, &.delete, &.share, &.bookmark, &.create {
+          float: right;
+        }
       }
       button.create {
         color: $attention_fg;