diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 062e31ff5..d4d1a4a8b 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -346,7 +346,7 @@ let appearNote = $computed(() =>
 	isRenote ? (note.renote as misskey.entities.Note) : note,
 );
 const isMyRenote = $i && $i.id === note.userId;
-const showContent = ref(false);
+const showContent = ref(defaultStore.state.alwaysExpandCws);
 const isDeleted = ref(false);
 const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index eb0ba8504..dd28974d6 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -224,7 +224,7 @@ const noteEl = $ref();
 const menuButton = ref<HTMLElement>();
 const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
 const reactButton = ref<HTMLElement>();
-const showContent = ref(false);
+const showContent = ref(defaultStore.state.alwaysExpandCws);
 const isDeleted = ref(false);
 const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 76c6ce3eb..f32869979 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -249,16 +249,16 @@ const urls = props.note.text
 	: null;
 
 const cwStyle = computed (() => `_cw_style_${defaultStore.state.cwStyle}`);
-let _showContent = $ref(null);
+let _showContent = $ref(defaultStore.state.alwaysExpandCws);
 let showContent = $computed({
 	set(val) { _showContent = val },
 	get() {
-		if (props.forceExpandCw != null) {
+		if (props.forceExpandCw != null && props.detailedView) {
 			_showContent = props.forceExpandCw;
 			props.forceExpandCw = null;
 		}
 
-		return _showContent || false;
+		return _showContent;
 	},
 })
 
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index 6c840771a..895c2dbbd 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -414,7 +414,8 @@ watch(
 		advancedMfm,
 		autoplayMfm,
 		expandOnNoteClick,
-		cwStyle
+		cwStyle,
+		alwaysExpandCws
 	],
 	async () => {
 		await reloadAsk();