diff --git a/locales/en-US.yml b/locales/en-US.yml
index 86e7620dd..04bd55631 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -629,6 +629,7 @@ deletedNote: "Deleted post"
 invisibleNote: "Invisible post"
 enableInfiniteScroll: "Automatically load more"
 visibility: "Visiblility"
+cannotChangeScopeWhenEditing: "You can't change visibility of this post while editing"
 poll: "Poll"
 useCw: "Hide content"
 enablePlayer: "Open video player"
diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index fe7118196..d5d4007b9 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -33,9 +33,9 @@
 				></span>
 				<button
 					ref="visibilityButton"
-					v-tooltip="i18n.ts.visibility"
+					v-tooltip="$props.editId != null ? i18n.ts.cannotChangeScopeWhenEditing : i18n.ts.visibility"
 					class="_button visibility"
-					:disabled="channel != null"
+					:disabled="channel != null || $props.editId != null"
 					@click="setVisibility"
 				>
 					<span v-if="visibility === 'public'"