diff --git a/InvenTree/build/models.py b/InvenTree/build/models.py
index ad482b8dc6..f9ffc99953 100644
--- a/InvenTree/build/models.py
+++ b/InvenTree/build/models.py
@@ -51,7 +51,7 @@ class Build(models.Model):
                              related_name='builds',
                              limit_choices_to={
                                  'is_template': False,
-                                 'buildable': True,
+                                 'assembly': True,
                                  'active': True
                              },
                              help_text='Select part to build',
diff --git a/InvenTree/part/forms.py b/InvenTree/part/forms.py
index 841622b865..2eb9600065 100644
--- a/InvenTree/part/forms.py
+++ b/InvenTree/part/forms.py
@@ -92,10 +92,10 @@ class EditPartForm(HelperForm):
             'category',
             'name',
             'IPN',
-            'is_template',
-            'variant_of',
             'description',
             'keywords',
+            'variant_of',
+            'is_template',
             'URL',
             'default_location',
             'default_supplier',