diff --git a/app/assets/javascripts/discourse/components/post-menu.js.es6 b/app/assets/javascripts/discourse/components/post-menu.js.es6
index 89417192edd..33800387f2c 100644
--- a/app/assets/javascripts/discourse/components/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/components/post-menu.js.es6
@@ -85,8 +85,10 @@ const PostMenuComponent = Ember.Component.extend(StringBuffer, {
 
   // Delegate click actions
   click(e) {
-    const $target = $(e.target),
-        action = $target.data('action') || $target.parent().data('action');
+    const $target = $(e.target);
+    const action = $target.data('action') || $target.parent().data('action');
+
+    if ($target.prop('disabled') || $target.parent().prop('disabled')) { return; }
 
     if (!action) return;
     const handler = this["click" + action.classify()];
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index fd4e16ccc1f..873ed56a2e0 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -134,10 +134,8 @@ nav.post-controls {
 
     &:active {
       background: dark-light-diff($tertiary, $secondary, 50%, -35%);
-    box-shadow: inset 0 1px 3px rgba(0,0,0, .3);
-
+      box-shadow: inset 0 1px 3px rgba(0,0,0, .3);
     }
-
   }
 
   .create i {
@@ -153,13 +151,13 @@ nav.post-controls {
     margin-left: 3px;
     transition: all linear 0.15s;
 
-         &:hover {
+        &:hover {
           background: dark-light-diff($primary, $secondary, 90%, -60%);
           color: $primary;
         }
 
         &:active {
-            box-shadow: inset 0 1px 3px rgba(0,0,0, .4);
+          box-shadow: inset 0 1px 3px rgba(0,0,0, .4);
         }
 
         &.hidden {
@@ -183,6 +181,9 @@ nav.post-controls {
         &.has-like[disabled]:hover {
           background: transparent;
         }
+        &.has-like[disabled]:active {
+          box-shadow: none;
+        }
 
         &.bookmark {padding: 8px 11px; }