diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index fc526f6573..ad78f5a4e1 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -208,6 +208,8 @@ $lang->my->work = 'Work';
 
 $lang->project->list = 'Project List';
 
+$lang->execution->list = "{$lang->executionCommon} List";
+
 $lang->doc->recent   = 'Recent';
 $lang->doc->my       = 'My';
 $lang->doc->favorite = 'Favorite';
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 9aa7e71463..0f3515c215 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -214,8 +214,8 @@ $lang->scrum->menu->settings['subMenu']->group       = array('link' => "{$lang->
 
 /* Execution menu. */
 $lang->execution->homeMenu = new stdclass();
-$lang->execution->homeMenu->index = "$lang->dashboard|execution|index|";
-$lang->execution->homeMenu->list  = array('link' => "{$lang->execution->common}|execution|all|", 'alias' => 'create,batchedit');
+if($config->systemMode == 'new') $lang->execution->homeMenu->index = "$lang->dashboard|execution|index|";
+$lang->execution->homeMenu->list  = array('link' => "{$lang->executionCommon}|execution|all|", 'alias' => 'create,batchedit');
 
 $lang->execution->menu = new stdclass();
 $lang->execution->menu->task     = array('link' => "{$lang->task->common}|execution|task|executionID=%s", 'subModule' => 'task,tree', 'alias' => 'importtask,importbug');
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 846c180d78..cefb5ce79d 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -208,6 +208,8 @@ $lang->my->work = '待处理';
 
 $lang->project->list = '项目列表';
 
+$lang->execution->list = "{$lang->executionCommon}列表";
+
 $lang->doc->recent   = '最近文档';
 $lang->doc->my       = '我的文档';
 $lang->doc->favorite = '我的收藏';
diff --git a/module/common/model.php b/module/common/model.php
index c7af0d1ff3..0ea55d87c7 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -519,6 +519,7 @@ class commonModel extends model
     public static function printHomeButton($openApp)
     {
         global $lang;
+        global $config;
 
         if(!$openApp) return;
         $icon = zget($lang->navIcons, $openApp, '');
@@ -527,6 +528,7 @@ class commonModel extends model
         {
             $nav = $lang->mainNav->$openApp;
             list($title, $currentModule, $currentMethod, $vars) = explode('|', $nav);
+            if($openApp == 'execution') $currentMethod = 'all';
         }
         else
         {
@@ -535,7 +537,7 @@ class commonModel extends model
             if($openApp == 'product') $currentMethod = 'all';
         }
 
-        $link = $openApp != 'execution' ? helper::createLink($currentModule, $currentMethod) : '';
+        $link = ($openApp != 'execution' or ($config->systemMode == 'classic')) ? helper::createLink($currentModule, $currentMethod) : '';
         $html = $link ? html::a($link, "$icon {$lang->$openApp->common}", '', "class='btn'") : "$icon {$lang->$openApp->common}";
 
         echo "<div class='btn-group header-btn'>" . $html . '</div>';