diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index d17d9e30b..0efa86645 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -453,6 +453,14 @@
             if($type == 'up') $new_idx = $var_idx-1;
             else $new_idx = $var_idx+1;
             if($new_idx<1) return new Object(-1,'msg_invalid_request');
+			
+			$args->module_srl = $module_srl;
+			$args->var_idx = $new_idx;
+			$output = executeQuery('document.getDocumentExtraKeys', $args);
+			if (!$output->toBool()) return $output;
+			if (!$output->data) return new Object(-1, 'msg_invalid_request');
+			unset($args);
+
             // update immediately if there is no idx to change
             if(!$extra_keys[$new_idx]) {
                 $args->module_srl = $module_srl;
diff --git a/modules/document/tpl/extra_keys.html b/modules/document/tpl/extra_keys.html
index f2b86a361..55c6aafe0 100644
--- a/modules/document/tpl/extra_keys.html
+++ b/modules/document/tpl/extra_keys.html
@@ -1,7 +1,6 @@
 <load target="js/document_admin.js" usecdn="true" />
 <!--%import("filter/insert_extra_var.xml")-->
 <!--%import("filter/delete_extra_var.xml")-->
-<load target="js/module_admin.js" usecdn="true" />
 
 <!--@if($selected_var_idx && $extra_keys[$selected_var_idx])-->
     {@ $selected_var = $extra_keys[$selected_var_idx] }
@@ -97,8 +96,8 @@
 					<td rowspan="3"><!--@if($val->is_required=='Y')--><b>{$lang->is_required}</b><!--@else-->N<!--@end--></td>
 					<td rowspan="3"><!--@if($val->search=='Y')--><b>{$lang->search_target}</b><!--@else-->N<!--@end--></td>
 					<td rowspan="3">
-						<!--@if($val->idx>1)--><a href="#" onclick="moveVar('up','{$module_srl}','{$val->idx}'); return false;" class="buttonSet buttonUp"><span>{$lang->cmd_modify}</span></a><!--@end-->
-						<a href="#" onclick="moveVar('down','{$module_srl}','{$val->idx}');return false;" class="buttonSet buttonDown">{$lang->cmd_modify}</a>
+						<!--@if($val->idx>1)--><a href="#" onclick="moveVar('up','{$module_srl}','{$val->idx}'); return false;" class="buttonSet buttonUp"><span>{$lang->cmd_move_up}</span></a><!--@end-->
+						<a cond="count($extra_keys) > $val->idx" href="#" onclick="moveVar('down','{$module_srl}','{$val->idx}');return false;" class="buttonSet buttonDown">{$lang->cmd_move_down}</a>
 						<a href="{getUrl('selected_var_idx',$val->idx)}" class="buttonSet buttonSetting"><span>{$lang->cmd_modify}</span></a>
 						<a href="#" onclick="return doDeleteExtraKey('{$module_srl}','{$val->idx}');" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a>
 					</td>