diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index fdfb2108ed..c7fccb1ee2 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -527,6 +527,15 @@
   "report_notification.open": "Open report",
   "search.placeholder": "Search",
   "search.search_or_paste": "Search or paste URL",
+  "searchability.change": "Change post searchability",
+  "searchability.direct.long": "Nobody can find, but you can",
+  "searchability.direct.short": "Self only",
+  "searchability.private.long": "Reacter of this post can find",
+  "searchability.private.short": "Reactionners",
+  "searchability.public.long": "Anyone can find",
+  "searchability.public.short": "Public",
+  "searchability.unlisted.long": "Your followers can find",
+  "searchability.unlisted.short": "Followers",
   "search_popout.search_format": "Advanced search format",
   "search_popout.tips.full_text": "Simple text returns posts you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
   "search_popout.tips.hashtag": "hashtag",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 7879a690a8..edea587f5e 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -525,6 +525,15 @@
   "report_notification.open": "通報を開く",
   "search.placeholder": "検索",
   "search.search_or_paste": "検索またはURLを入力",
+  "searchability.change": "検索許可範囲を変更",
+  "searchability.direct.long": "この投稿はあなたしか検索できません",
+  "searchability.direct.short": "自分のみ",
+  "searchability.private.long": "この投稿にリアクションした人だけが検索できます",
+  "searchability.private.short": "リアクションした人のみ",
+  "searchability.public.long": "この投稿は誰でも検索できます",
+  "searchability.public.short": "全て",
+  "searchability.unlisted.long": "この投稿はあなたのフォロワーしか検索できません",
+  "searchability.unlisted.short": "フォロワーのみ",
   "search_popout.search_format": "高度な検索フォーマット",
   "search_popout.tips.full_text": "表示名やユーザー名、ハッシュタグのほか、あなたの投稿やお気に入り、ブーストした投稿、返信に一致する単純なテキスト。",
   "search_popout.tips.hashtag": "ハッシュタグ",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index f9803dea75..7443cfdb78 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4764,6 +4764,8 @@ a.status-card.compact:hover {
     position: absolute;
     right: 0;
     bottom: 0;
+    color: purple;
+    pointer-events: none;
   }
 }
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b0606b62c0..97cefc852b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -795,6 +795,7 @@ en:
       remove: Remove post
       remove_media: Remove medias
       remove_history: Remove edit history
+      searchability: Searchability
       status_changed: Post changed
       title: Account posts
       trending: Trending
@@ -1562,6 +1563,15 @@ en:
         one: "%{count} vote"
         other: "%{count} votes"
       vote: Vote
+    searchabilities:
+      direct: Self only
+      direct_long: Nobody can find, but you can
+      private: Reactionners
+      private_long: Reacter of this post can find
+      public: Public
+      public_long: Anyone can find
+      unlisted: Followers only
+      unlisted_long: Your followers can find
     show_more: Show more
     show_newer: Show newer
     show_older: Show older
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 3f42663bea..561a38e5e6 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -781,6 +781,7 @@ ja:
       remove: 投稿を削除
       remove_media: メディアを削除
       remove_history: 編集履歴を削除
+      searchability: 検索許可
       status_changed: 投稿を変更しました
       title: 投稿一覧
       trending: トレンド
@@ -1519,6 +1520,15 @@ ja:
       total_votes:
         other: "%{count}票"
       vote: 投票
+    searchabilities:
+      direct: 自分のみ
+      direct_long: この投稿はあなたしか検索できません
+      private: リアクションした人
+      private_long: この投稿にリアクションした人しか検索できません
+      public: 公開
+      public_long: この投稿は誰でも検索できます
+      unlisted: フォロワーのみ
+      unlisted_long: この投稿はフォロワーのみが検索できます
     show_more: もっと見る
     show_newer: 新しいものを表示
     show_older: 古いものを表示
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 96978578bb..00aa828ba2 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -206,6 +206,7 @@ en:
         setting_crop_images: Crop images in non-expanded posts to 16x9
         setting_default_language: Posting language
         setting_default_privacy: Posting privacy
+        setting_default_searchability: Searchability
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialog before deleting a post
         setting_disable_swiping: Disable swiping motions
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 8fc8dd265e..3ffa286218 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -206,6 +206,7 @@ ja:
         setting_crop_images: 投稿の詳細以外では画像を16:9に切り抜く
         setting_default_language: 投稿する言語
         setting_default_privacy: 投稿の公開範囲
+        setting_default_searchability: 投稿の検索を許可する範囲
         setting_default_sensitive: メディアを常に閲覧注意としてマークする
         setting_delete_modal: 投稿を削除する前に確認ダイアログを表示する
         setting_disable_swiping: スワイプでの切り替えを無効にする