diff --git a/modules/editor/skins/xeed/editor.html b/modules/editor/skins/xeed/editor.html
index ba5a594b9..d2296f791 100644
--- a/modules/editor/skins/xeed/editor.html
+++ b/modules/editor/skins/xeed/editor.html
@@ -22,9 +22,9 @@
 	<!-- tool -->
 	<div class="tool">
 		<a href="#edit" class="skip">{$lang->edit->jumptoedit}</a>
-		<div class="t1" cond="$allow_file_upload || $enable_component">
+		<div class="t1" cond="$allow_fileupload || $enable_component">
 			<button type="button" class="mo"><span>{$lang->edit->toolbar_moreless}</span></button>
-			<ul class="u1" cond="$allow_file_upload">
+			<ul class="u1" cond="$allow_fileupload">
 				<li class="ti al">
 					<a href="#xdal" class="tb">
 						<span class="all">{$lang->edit->upload_list}</span>
diff --git a/modules/editor/skins/xeed/js/xeed.js b/modules/editor/skins/xeed/js/xeed.js
index 813401c25..a728a7d7f 100644
--- a/modules/editor/skins/xeed/js/xeed.js
+++ b/modules/editor/skins/xeed/js/xeed.js
@@ -236,16 +236,18 @@ Xeed = xe.createApp('Xeed', {
 	},
 	
 	_onresize : function() {
-		var $tb = this.$toolbar, $t1 = $tb.find('>.t1'), $t2 = $tb.find('>.t2'), $t1_mo, $t2_mo, base_top;
-		
-		base_top = $t1.find('>ul').removeClass('_overflow').show().get(0).offsetTop;
-		$t1_mo   = $t1.find('>button.mo').hide();
-		$.each($t1.find('>ul').get().reverse(), function(){
-			if (this.offsetTop > base_top) {
-				$(this).addClass('_overflow').hide();
-				$t1_mo.show();
-			}
-		});
+		var $tb = this.$toolbar, $t1 = $tb.find('>.t1'), $t2 = $tb.find('>.t2'), $t1_mo, $t2_mo, $t1_ul, base_top;
+
+		if ($t1.length && ($t1_ul=$t1.find('>ul')).length) {
+			base_top = $t1_ul.removeClass('_overflow').show().get(0).offsetTop;
+			$t1_mo   = $t1.find('>button.mo').hide();
+			$.each($t1.find('>ul').get().reverse(), function(){
+				if (this.offsetTop > base_top) {
+					$(this).addClass('_overflow').hide();
+					$t1_mo.show();
+				}
+			});
+		}
 
 		base_top = $t2.find('>ul').removeClass('_overflow').show().get(0).offsetTop;
 		$t2_mo = $t2.find('>button.mo').hide();