diff --git a/config/site_settings.yml b/config/site_settings.yml
index 704e874b68a..758dda831fe 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -122,7 +122,7 @@ basic:
   post_menu_hidden_items:
     client: true
     type: list
-    default: 'bookmark|edit|delete|admin'
+    default: 'flag|bookmark|edit|delete|admin'
     choices:
      - like
      - edit
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index 0beed5c9799..cac5ed759c7 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -14,7 +14,7 @@ Discourse.SiteSettingsOriginal = {
   "ga_domain_name":"",
   "top_menu":"latest|new|unread|categories|top",
   "post_menu":"like-count|like|share|flag|edit|bookmark|delete|admin|reply",
-  "post_menu_hidden_items":"edit|delete|admin",
+  "post_menu_hidden_items":"flag|edit|delete|admin",
   "share_links":"twitter|facebook|google+|email",
   "category_colors":"BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|808281|B3B5B4|283890",
   "enable_mobile_theme":true,