diff --git a/module/product/model.php b/module/product/model.php
index c971f6294f..528d47b3e3 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -622,6 +622,18 @@ class productModel extends model
         $roadmap  = array();
         $total    = 0;
 
+        $parents = array();
+        foreach($plans as $planID => $plan)
+        {
+            if($plan->parent == '-1')
+            {
+                $parents[$planID] = $plan->title;
+                unset($plans[$planID]);
+            }
+
+            if($plan->parent > 0 and isset($parents[$plan->parent])) $plan->title = $parents[$plan->parent] . ' / ' . $plan->title;
+        }
+
         foreach($plans as $plan)
         {
             if(($plan->end != '0000-00-00' and strtotime($plan->end) - time() <= 0) or $plan->end == '2030-01-01') continue;
diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php
index c81f61cb51..832dff2d2f 100644
--- a/module/productplan/view/create.html.php
+++ b/module/productplan/view/create.html.php
@@ -68,7 +68,7 @@
               <?php echo html::submitButton();?>
               <?php echo html::backButton();?>
               <?php echo html::hidden('product', $product->id);?>
-              <?php echo html::hidden('branch', $parent ? $parentPlan->branch : $branch);?>
+              <?php if($parent) echo html::hidden('branch', $parentPlan->branch);?>
               <?php echo html::hidden('parent', $parent);?>
             </td>
           </tr>