diff --git a/modules/module/tpl/js/multilingual.js b/modules/module/tpl/js/multilingual.js
index 530f15a15..d1f273e8f 100644
--- a/modules/module/tpl/js/multilingual.js
+++ b/modules/module/tpl/js/multilingual.js
@@ -4,7 +4,7 @@ jQuery(function($){
 $('#langList')
 	.find('form').hide().attr('aria-hidden','true').end() // collapse all language input control
 	.delegate('button._edit', 'click', function(){
-		var $this = $(this), $form = $this.next('form');
+		var $this = $(this), $form = $this.parent().next('form');
 
 		// toggle input control
 		if($form.attr('aria-hidden') == 'false') {
@@ -22,14 +22,14 @@ $('#langList')
 		function on_complete(ret) {
 			var name = ret['lang_name'], list = ret['lang_list']['item'], elems = $form[0].elements, item;
 
-			$form.find('label+textarea').prev('label').css('visibility','hidden');
+			$form.find('label+textarea').prev('label').css('visibility','visible');
 
 			if(!$.isArray(list)) list = [list];
 			for(var i=0,c=list.length; i < c; i++) {
 				item = list[i];
 				if(item && item.lang_code && elems[item.lang_code]) {
 					elems[item.lang_code].value = item.value;
-					if(!item.value) $(elems[item.lang_code]).prev('label').css('visibility','visible');
+					if(item.value) $(elems[item.lang_code]).prev('label').css('visibility','hidden');
 				}
 			}
 		}
diff --git a/modules/module/tpl/module_langcode.html b/modules/module/tpl/module_langcode.html
index b8d387573..1e694fae5 100644
--- a/modules/module/tpl/module_langcode.html
+++ b/modules/module/tpl/module_langcode.html
@@ -16,6 +16,12 @@
 			<input type="hidden" name="act" value="procModuleAdminInsertLang" />
 			<input type="hidden" name="lang_name" value="{$langName}" />
 			<ul>
+				{@
+					/* move current language to the top */
+					$a = array($lang_type=>$lang_supported[$lang_type]);
+					unset($lang_supported[$lang_type]);
+					$lang_supported = array_merge($a, $lang_supported);
+				}
 				<li class="{$key2}" loop="$lang_supported=>$key2,$value2"><label for="{$langName}_{$key2}">{$value2}</label> <textarea rows="1" cols="42" name="{$key2}" id="{$langName}_{$key2}"></textarea></li>
 			</ul>
 			<div class="btnArea">