diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js
index e7be097e79..f4f69ef215 100644
--- a/public/src/client/topic/postTools.js
+++ b/public/src/client/topic/postTools.js
@@ -60,9 +60,9 @@ define('forum/topic/postTools', [
 		postEl.find('[component="post/quote"], [component="post/bookmark"], [component="post/reply"], [component="post/flag"], [component="user/chat"]')
 			.toggleClass('hidden', isDeleted);
 
-		postEl.find('[component="post/delete"]').toggleClass('hidden', isDeleted);
-		postEl.find('[component="post/restore"]').toggleClass('hidden', !isDeleted);
-		postEl.find('[component="post/purge"]').toggleClass('hidden', !isDeleted);
+		postEl.find('[component="post/delete"]').toggleClass('hidden', isDeleted).parent().attr('hidden', isDeleted ? '' : null);
+		postEl.find('[component="post/restore"]').toggleClass('hidden', !isDeleted).parent().attr('hidden', !isDeleted ? '' : null);
+		postEl.find('[component="post/purge"]').toggleClass('hidden', !isDeleted).parent().attr('hidden', !isDeleted ? '' : null);
 
 		PostTools.removeMenu(postEl);
 	};
diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js
index 14d581a80f..7fc6ced0e9 100644
--- a/public/src/client/topic/threadTools.js
+++ b/public/src/client/topic/threadTools.js
@@ -183,8 +183,8 @@ define('forum/topic/threadTools', [
 
 		var isLocked = data.isLocked && !ajaxify.data.privileges.isAdminOrMod;
 
-		components.get('topic/lock').toggleClass('hidden', data.isLocked);
-		components.get('topic/unlock').toggleClass('hidden', !data.isLocked);
+		components.get('topic/lock').toggleClass('hidden', data.isLocked).parent().attr('hidden', data.isLocked ? '' : null);
+		components.get('topic/unlock').toggleClass('hidden', !data.isLocked).parent().attr('hidden', !data.isLocked ? '' : null);
 
 		var hideReply = (data.isLocked || ajaxify.data.deleted) && !ajaxify.data.privileges.isAdminOrMod;
 
@@ -207,9 +207,9 @@ define('forum/topic/threadTools', [
 			return;
 		}
 
-		components.get('topic/delete').toggleClass('hidden', data.isDelete);
-		components.get('topic/restore').toggleClass('hidden', !data.isDelete);
-		components.get('topic/purge').toggleClass('hidden', !data.isDelete);
+		components.get('topic/delete').toggleClass('hidden', data.isDelete).parent().attr('hidden', data.isDelete ? '' : null);
+		components.get('topic/restore').toggleClass('hidden', !data.isDelete).parent().attr('hidden', !data.isDelete ? '' : null);
+		components.get('topic/purge').toggleClass('hidden', !data.isDelete).parent().attr('hidden', !data.isDelete ? '' : null);
 		components.get('topic/deleted/message').toggleClass('hidden', !data.isDelete);
 
 		var hideReply = data.isDelete && !ajaxify.data.privileges.isAdminOrMod;
@@ -229,8 +229,8 @@ define('forum/topic/threadTools', [
 			return;
 		}
 
-		components.get('topic/pin').toggleClass('hidden', data.isPinned);
-		components.get('topic/unpin').toggleClass('hidden', !data.isPinned);
+		components.get('topic/pin').toggleClass('hidden', data.isPinned).parent().attr('hidden', data.isPinned ? '' : null);
+		components.get('topic/unpin').toggleClass('hidden', !data.isPinned).parent().attr('hidden', !data.isPinned ? '' : null);
 		$('[component="post/header"] i.fa-thumb-tack').toggleClass('hidden', !data.isPinned);
 		ajaxify.data.pinned = data.isPinned;
 	};