diff --git a/apps/meteor/app/ui-utils/client/lib/MessageAction.ts b/apps/meteor/app/ui-utils/client/lib/MessageAction.ts
index f35b9be0197d..db4b35bed541 100644
--- a/apps/meteor/app/ui-utils/client/lib/MessageAction.ts
+++ b/apps/meteor/app/ui-utils/client/lib/MessageAction.ts
@@ -181,7 +181,7 @@ export const MessageAction = new (class {
 		if (props.message) {
 			return this.getButtonsByCondition({ ...props, context }, this.getButtonsByContext(context, filteredButtons));
 		}
-		return filteredButtons;
+		return allButtons;
 	}
 
 	resetButtons(): void {
diff --git a/apps/meteor/client/components/message/toolbox/Toolbox.tsx b/apps/meteor/client/components/message/toolbox/Toolbox.tsx
index 80420d4e1709..608eea2caa47 100644
--- a/apps/meteor/client/components/message/toolbox/Toolbox.tsx
+++ b/apps/meteor/client/components/message/toolbox/Toolbox.tsx
@@ -21,7 +21,7 @@ const getMessageContext = (message: IMessage, room: IRoom): MessageActionContext
 	if (isRoomFederated(room)) {
 		return 'federated';
 	}
-	if (isThreadMessage(message)) {
+	if (isThreadMessage(message) || message.renderedOnThread) {
 		return 'threads';
 	}
 	return 'message';