diff --git a/indra/newview/skins/default/xui/en-us/floater_asset_text_editor.xml b/indra/newview/skins/default/xui/en-us/floater_asset_text_editor.xml
index 9d62a4316..653bb675c 100644
--- a/indra/newview/skins/default/xui/en-us/floater_asset_text_editor.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_asset_text_editor.xml
@@ -5,5 +5,5 @@
 	<text name="status_text" follows="left|top" left="10" top="-25" height="20">Loading...</text>
 	<button name="upload_btn" follows="right|top" top="-25" right="-120" width="100" bottom="155" label="[UPLOAD]" enabled="false"/>
 	<button name="save_btn" follows="right|top" top="-25" right="-10" width="100" bottom="155" label="Save" enabled="false"/>
-	<simple_text_editor name="text_editor" follows="left|top|right|bottom" left="10" top="-50" right="-10" bottom="10" max_length="-1" embedded_items="true" visible="false"/>
+	<simple_text_editor name="text_editor" follows="left|top|right|bottom" left="10" top="-50" right="-10" bottom="10" max_length="2147483647" embedded_items="true" visible="false"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index c8974c621..73d3f4dff 100644
--- a/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -99,6 +99,17 @@
 			     width="121">
 				[FIRST] [LAST]
 			</line_editor>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
+			     mouse_opaque="true" name="key_label" v_pad="0" width="90">
+				Avatar Key:
+			</text>
+			<name_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+			     border_thickness="1" bottom_delta="0" enabled="false" follows="left|top"
+			     font="SansSerifSmall" height="16" is_unicode="false" left_delta="95"
+			     max_length="48" mouse_opaque="false" name="avatar_key"
+			     text_readonly_color="1, 1, 1, 1" width="260" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-44" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
@@ -384,17 +395,6 @@ notes.  This person cannot see them, nor can other people.
 			     font="SansSerif" height="256" is_unicode="false" left="10"
 			     max_length="1023" mouse_opaque="true" name="notes edit" width="400"
 			     word_wrap="false" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-			     mouse_opaque="true" name="key_label" v_pad="0" width="90">
-				Avatar Key:
-			</text>
-			<name_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
-			     border_thickness="1" bottom_delta="0" enabled="false" follows="left|top"
-			     font="SansSerifSmall" height="16" is_unicode="false" left_delta="95"
-			     max_length="48" mouse_opaque="false" name="avatar_key"
-			     text_readonly_color="1, 1, 1, 1" width="260" />
 		</panel>
 	</tab_container>
 	<button bottom="-483" font="SansSerif" halign="center" height="20" label="OK"