diff --git a/app/assets/javascripts/discourse/views/post-menu.js.es6 b/app/assets/javascripts/discourse/views/post-menu.js.es6
index 2276e95b74..e865eec7a2 100644
--- a/app/assets/javascripts/discourse/views/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/views/post-menu.js.es6
@@ -135,8 +135,11 @@ var PostMenuView = Discourse.View.extend(StringBuffer, {
     });
 
     // Only show ellipsis if there is more than one button hidden
-    if (!this.get('collapsed') || (allButtons.length <= visibleButtons.length + 1)) {
+    // if there are no more buttons, we are not collapsed
+    var collapsed = this.get('collapsed');
+    if (!collapsed || (allButtons.length <= visibleButtons.length + 1)) {
       visibleButtons = allButtons;
+      if (collapsed) { this.set('collapsed', false); }
     } else {
       visibleButtons.splice(visibleButtons.length - 1, 0, this.buttonForShowMoreActions(post));
     }