diff --git a/packages/frontend/src/utility/get-note-menu.ts b/packages/frontend/src/utility/get-note-menu.ts
index e73067baed..dbdff5f000 100644
--- a/packages/frontend/src/utility/get-note-menu.ts
+++ b/packages/frontend/src/utility/get-note-menu.ts
@@ -464,10 +464,6 @@ export function getNoteMenu(props: {
 		if (appearNote.userId !== $i.id) {
 			menuItems.push({ type: 'divider' });
 			menuItems.push(getAbuseNoteMenu(appearNote, i18n.ts.reportAbuse));
-
-			if ($i.isModerator || $i.isAdmin) {
-				menuItems.push(getMandatoryCWMenu(appearNote));
-			}
 		}
 
 		if (appearNote.channel && (appearNote.channel.userId === $i.id || $i.isModerator || $i.isAdmin)) {
@@ -520,6 +516,9 @@ export function getNoteMenu(props: {
 					action: delEdit,
 				});
 			}
+			if ($i.isModerator || $i.isAdmin) {
+				menuItems.push(getMandatoryCWMenu(appearNote));
+			}
 			menuItems.push({
 				icon: 'ti ti-trash',
 				text: i18n.ts.delete,
diff --git a/packages/frontend/src/utility/get-user-menu.ts b/packages/frontend/src/utility/get-user-menu.ts
index f65660ff6c..1bad4b9d01 100644
--- a/packages/frontend/src/utility/get-user-menu.ts
+++ b/packages/frontend/src/utility/get-user-menu.ts
@@ -173,6 +173,10 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
 			action: () => {
 				router.push(`/admin/user/${user.id}`);
 			},
+		}, {
+			icon: 'ph-warning ph-bold ph-lg',
+			text: i18n.ts.mandatoryCW,
+			action: setMandatoryCW,
 		}, { type: 'divider' });
 	}
 
@@ -415,14 +419,6 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
 			text: i18n.ts.reportAbuse,
 			action: reportAbuse,
 		});
-
-		if ($i.isModerator) {
-			menuItems.push({
-				icon: 'ph-warning ph-bold ph-lg',
-				text: i18n.ts.mandatoryCW,
-				action: setMandatoryCW,
-			});
-		}
 	}
 
 	if (user.host !== null) {