diff --git a/indra/newview/skins/default/xui/en/floater_fs_im_session.xml b/indra/newview/skins/default/xui/en/floater_fs_im_session.xml
index a77d5786b9..1d81dca1b6 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_im_session.xml
@@ -670,7 +670,6 @@
                image_overlay="Emoji_Picker_Icon"
                right="-11"
                name="emoji_picker_toggle_btn"
-               tab_stop="false"
                tool_tip="Show emoji panel"
                width="24"/>
               <button
@@ -685,7 +684,6 @@
                image_overlay="Arrow_Down"
                right="-1"
                name="emoji_recent_panel_toggle_btn"
-               tab_stop="false"
                tool_tip="Shows/hides recent emojis"
                left_pad="0"
                width="10"/>
@@ -731,7 +729,6 @@
              follows="top|left|right"
              layout="topleft"
              max_visible="20"
-             tab_stop="false"
              top="0"
              left="5"
              right="-1"
diff --git a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
index 23e7e75819..7a273af34c 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
@@ -288,7 +288,6 @@
                image_overlay="Emoji_Picker_Icon"
                right="-11"
                name="emoji_picker_toggle_btn"
-               tab_stop="false"
                tool_tip="Show emoji panel"
                width="24"/>
               <button
@@ -303,7 +302,6 @@
                image_overlay="Arrow_Down"
                right="-1"
                name="emoji_recent_panel_toggle_btn"
-               tab_stop="false"
                tool_tip="Shows/hides recent emojis"
                left_pad="0"
                width="10"/>
@@ -415,13 +413,12 @@
              left="5"
              right="-1"
              height="25"
-            >Recently used emojis will appear here</text>
+             >Recently used emojis will appear here</text>
             <emoji_complete
              name="emoji_recent_icons_ctrl"
              follows="top|left|right"
              layout="topleft"
              max_visible="20"
-             tab_stop="false"
              top="0"
              left="5"
              right="-1"