diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 68b619f4b4..a3d57f6690 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1530,7 +1530,19 @@ void LLTextBase::draw()
             bg_rect.intersectWith( text_rect );
 
         gl_rect_2d( text_rect, bg_color, true );
+
+        // <FS> Additionally set the font color of highlighted text instead of using LabelTextColor
+        const LLColor4& font_color = ll::ui::SearchableControl::getHighlightFontColor();
+        setColor(font_color);
+        // </FS>
     }
+    // <FS> Set the font color back to LabelTextColor if not highlighted
+    else
+    {
+        const LLColor4& font_color = LLUIColorTable::instance().getColor("LabelTextColor");
+        setColor(font_color);
+    }
+    // </FS>
 
     bool should_clip = mClip || mScroller != NULL;
     // <FS:Zi> Fix text bleeding at top edge of scrolling text editors
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 3ad611d33d..61f2cd42d1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -1902,7 +1902,7 @@
      label_height="0"
      layout="topleft"
      left="350"
-     top_pad="5"
+     top_pad="9"
      name="area_search_beacon_color"
      tool_tip="Choose area search beacon color"
      width="44">