diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 61449e0baa..fb62a961f3 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -26587,6 +26587,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>FSSnapshotShowGuides</key>
+    <map>
+      <key>Comment</key>
+      <string>If enabled, shows composition guides inside the snapshot frame.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>FSSnapshotFrameBorderColor</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/app_settings/shaders/class1/post/snapshotFrameF.glsl b/indra/newview/app_settings/shaders/class1/post/snapshotFrameF.glsl
index 1e3576d19e..651fa07665 100644
--- a/indra/newview/app_settings/shaders/class1/post/snapshotFrameF.glsl
+++ b/indra/newview/app_settings/shaders/class1/post/snapshotFrameF.glsl
@@ -49,10 +49,10 @@ void main()
     else
     {
         // Draw border around the snapshot frame
-        if ((tc.x >= border_rect_px.x  && tc.x < frame_rect_px.x) ||
-            (tc.x <= border_rect_px.z  && tc.x > frame_rect_px.z) ||
-            (tc.y >= border_rect_px.y  && tc.y < frame_rect_px.y) ||
-            (tc.y <= border_rect_px.w  && tc.y > frame_rect_px.w))
+        if ((tc.x >= border_rect_px.x && tc.x < frame_rect_px.x) ||
+            (tc.x > frame_rect_px.z && tc.x <= border_rect_px.z) ||
+            (tc.y >= border_rect_px.y && tc.y < frame_rect_px.y) ||
+            (tc.y > frame_rect_px.w && tc.y <= border_rect_px.w))
         {
             diff.rgb = mix(diff.rgb, border_color, 0.5);
         }