diff --git a/module/build/js/edit.ui.js b/module/build/js/edit.ui.js
index 01603e52e8..76e7eed8d7 100644
--- a/module/build/js/edit.ui.js
+++ b/module/build/js/edit.ui.js
@@ -28,7 +28,7 @@ function changeProduct()
 
     $('[name^=branch]').zui('picker').$.setValue('');
     loadBranches();
-    loadSystem();
+    if(!build.isChild) loadSystem();
 }
 
 function changeBranches()
diff --git a/module/build/model.php b/module/build/model.php
index a9ffa7bc45..45f7d59471 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -39,6 +39,13 @@ class buildModel extends model
         $build = $this->loadModel('file')->replaceImgURL($build, 'desc');
         $build->files = $this->file->getByObject('build', $buildID);
         if($setImgSize) $build->desc = $this->file->setImgSize($build->desc);
+
+        $build->isChild = false;
+        if($this->app->rawMethod == 'edit')
+        {
+            if($this->dao->select('id')->from(TABLE_BUILD)->where("FIND_IN_SET($buildID, `builds`)")->fetch()) $build->isChild = true;
+            if(!$build->isChild && $this->dao->select('id')->from(TABLE_RELEASE)->where("FIND_IN_SET($buildID, `build`)")->fetch()) $build->isChild = true;
+        }
         return $build;
     }
 
diff --git a/module/build/ui/edit.html.php b/module/build/ui/edit.html.php
index e8e2d5922d..40c668214c 100644
--- a/module/build/ui/edit.html.php
+++ b/module/build/ui/edit.html.php
@@ -145,7 +145,8 @@ formPanel
                     picker
                     (
                         set::name('system'),
-                        set::required(true),
+                        set::required(empty($build->isChild)),
+                        set::disabled(!empty($build->isChild)),
                         set::items($systemList),
                         set::value($build->system)
                     )