diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index c33bf14354..548ee2037d 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -338,8 +338,10 @@ void LLFloater::initFloater(const Params& p)
 
     // Help button: '?'
     //SL-14050 Disable all Help question marks
-    // <FS:Ansariel> Nope!
-    mButtonsEnabled[BUTTON_HELP] = !mHelpTopic.empty();// false;
+    // <FS:TJ> Disable the help button only if the debug setting is on
+    static LLUICachedControl<bool> hide_help_buttons ("FSHideHelpButtons", false);
+    mButtonsEnabled[BUTTON_HELP] = !mHelpTopic.empty() && !hide_help_buttons;// false;
+    // </FS:TJ>
 
     // Minimize button only for top draggers
     if ( !mDragOnLeft && mCanMinimize )
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e8d6fcdc6a..7531ea03c2 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -26762,5 +26762,16 @@ Change of this parameter will affect the layout of buttons in notification toast
       <integer>0</integer>
     </map>
     <!-- </FS:Zi> Area Search Defaults -->
+    <key>FSHideHelpButtons</key>
+    <map>
+      <key>Comment</key>
+      <string>When enabled, hides the help button from floaters (requires restart)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
   </map>
 </llsd>