diff --git a/module/productplan/config.php b/module/productplan/config.php
index 1256d1d018..18074af9ca 100644
--- a/module/productplan/config.php
+++ b/module/productplan/config.php
@@ -52,10 +52,13 @@ $config->productplan->actionList['activate']['innerClass']   = 'ajax-submit';
 $config->productplan->actionList['createExecution']['icon']         = 'plus';
 $config->productplan->actionList['createExecution']['hint']         = $lang->productplan->createExecution;
 $config->productplan->actionList['createExecution']['text']         = $lang->productplan->createExecution;
-$config->productplan->actionList['createExecution']['data-target']  = '#createExecutionModal';
-$config->productplan->actionList['createExecution']['data-toggle']  = 'modal';
 $config->productplan->actionList['createExecution']['url']          = array('module' => 'execution', 'method' => 'create');
 $config->productplan->actionList['createExecution']['notLoadModel'] = true;
+if(!$app->rawModule || $app->rawModule != 'projectplan')
+{
+    $config->productplan->actionList['createExecution']['data-target'] = '#createExecutionModal';
+    $config->productplan->actionList['createExecution']['data-toggle'] = 'modal';
+}
 
 $config->productplan->actionList['linkStory']['icon']         = 'link';
 $config->productplan->actionList['linkStory']['hint']         = $lang->productplan->linkStory;
diff --git a/module/productplan/ui/browsebylist.html.php b/module/productplan/ui/browsebylist.html.php
index cc73c43592..e4f39b32ea 100644
--- a/module/productplan/ui/browsebylist.html.php
+++ b/module/productplan/ui/browsebylist.html.php
@@ -39,6 +39,8 @@ toolbar
 
 $cols = $this->loadModel('datatable')->getSetting('productplan');
 $cols['title']['data-app'] = $app->tab;
+if($app->rawModule == 'projectplan') $cols['actions']['list']['createExecution']['url']['params'] = "projectID={$projectID}&executionID=0&copyExecutionID=0&planID={id}";
+
 $tableData = initTableData($plans, $cols, $this->productplan);
 foreach($tableData as $plan)
 {