diff --git a/module/build/model.php b/module/build/model.php
index 252b711b27..944e8db1e1 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -559,8 +559,10 @@ class buildModel extends model
 
             $menu .= $this->buildFlowMenu('build', $build, 'view', 'direct');
 
-            if(common::hasPriv('build', 'edit'))   echo html::a(helper::createLink('build', 'edit',   $params), "<i class='icon-common-edit icon-edit'></i> "    . $this->lang->edit,   '', "class='btn btn-link' title='{$this->lang->build->edit}' data-app='{$app->tab}'");
-            if(common::hasPriv('build', 'delete')) echo html::a(helper::createLink('build', 'delete', $params), "<i class='icon-common-delete icon-trash'></i> " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->build->delete}' target='hiddenwin' data-app='{$app->tab}'");
+            $editClickable   = $this->buildMenu('build', 'edit',   $params, $build, $type, '', '', '', '', '', '', false);
+            $deleteClickable = $this->buildMenu('build', 'delete',   $params, $build, $type, '', '', '', '', '', '', false);
+            if($editClickable)   $menu .= html::a(helper::createLink('build', 'edit',   $params), "<i class='icon-common-edit icon-edit'></i> "    . $this->lang->edit,   '', "class='btn btn-link' title='{$this->lang->build->edit}' data-app='{$app->tab}'");
+            if($deleteClickable) $menu .= html::a(helper::createLink('build', 'delete', $params), "<i class='icon-common-delete icon-trash'></i> " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->build->delete}' target='hiddenwin' data-app='{$app->tab}'");
         }
 
         return $menu;
diff --git a/module/productplan/model.php b/module/productplan/model.php
index f515ca5fce..5ef9d2dc91 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -1124,8 +1124,10 @@ class productplanModel extends model
             $menu .= $this->buildFlowMenu('productplan', $plan, $type, 'direct');
             $menu .= "<div class='divider'></div>";
 
-            if(common::hasPriv('productplan', 'edit', $plan)) $menu .= html::a(helper::createLink('productplan', 'edit', $params), "<i class='icon-common-edit icon-edit'></i> " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'");
-            if($plan->parent >= 0 && common::hasPriv('productplan', 'delete', $plan)) $menu .= html::a(helper::createLink('productplan', 'delete', $params), "<i class='icon-common-delete icon-trash'></i> " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->delete}' target='hiddenwin'");
+            $editClickable   = $this->buildMenu('productplan', 'edit',   $params, $plan, $type, '', '', '', '', '', '', false);
+            $deleteClickable = $this->buildMenu('productplan', 'delete',   $params, $plan, $type, '', '', '', '', '', '', false);
+            if($editClickable)   $menu .= html::a(helper::createLink('productplan', 'edit', $params), "<i class='icon-common-edit icon-edit'></i> " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'");
+            if($deleteClickable) $menu .= html::a(helper::createLink('productplan', 'delete', $params), "<i class='icon-common-delete icon-trash'></i> " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->delete}' target='hiddenwin'");
         }
 
         return $menu;
diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php
index 50287537bd..5127993445 100644
--- a/module/projectrelease/model.php
+++ b/module/projectrelease/model.php
@@ -266,8 +266,11 @@ class projectreleaseModel extends model
         $menu .= $this->buildFlowMenu('release', $release, 'view', 'direct');
         $menu .= "<div class='divider'></div>";
 
-        $menu .= $this->buildMenu('projectrelease', 'edit',   $params, $release, 'view');
-        $menu .= $this->buildMenu('projectrelease', 'delete', $params, $release, 'view', 'trash', 'hiddenwin');
+        $editClickable   = $this->buildMenu('projectrelease', 'edit',   $params, $release, 'view', '', '', '', '', '', '', false);
+        $deleteClickable = $this->buildMenu('projectrelease', 'delete',   $params, $release, 'view', '', '', '', '', '', '', false);
+        if($editClickable)   $menu .= html::a(helper::createLink('projectrelease', 'edit', $params), "<i class='icon-common-edit icon-edit'></i> " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'");
+        if($deleteClickable) $menu .= html::a(helper::createLink('projectrelease', 'delete', $params), "<i class='icon-common-delete icon-trash'></i> " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->delete}' target='hiddenwin'");
+
 
         return $menu;
     }
diff --git a/module/release/model.php b/module/release/model.php
index ed3b95dcd2..1efeaaa86b 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -710,8 +710,10 @@ class releaseModel extends model
         $menu .= $this->buildFlowMenu('release', $release, 'view', 'direct');
         $menu .= "<div class='divider'></div>";
 
-        if(common::hasPriv('release', 'edit', $release))   $menu .= html::a(helper::createLink('release', 'edit', $params), "<i class='icon-common-edit icon-edit'></i> " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'");
-        if(common::hasPriv('release', 'delete', $release)) $menu .= html::a(helper::createLink('release', 'delete', $params), "<i class='icon-common-delete icon-trash'></i> " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->delete}' target='hiddenwin'");
+        $editClickable   = $this->buildMenu('release', 'edit',   $params, $release, 'view', '', '', '', '', '', '', false);
+        $deleteClickable = $this->buildMenu('release', 'delete',   $params, $release, 'view', '', '', '', '', '', '', false);
+        if($editClickable)   $menu .= html::a(helper::createLink('release', 'edit', $params), "<i class='icon-common-edit icon-edit'></i> " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'");
+        if($deleteClickable) $menu .= html::a(helper::createLink('release', 'delete', $params), "<i class='icon-common-delete icon-trash'></i> " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->delete}' target='hiddenwin'");
 
         return $menu;
     }