diff --git a/InvenTree/part/forms.py b/InvenTree/part/forms.py
index 0b24e5a462..d72df4ed9f 100644
--- a/InvenTree/part/forms.py
+++ b/InvenTree/part/forms.py
@@ -174,7 +174,9 @@ class SetPartCategoryForm(forms.Form):
 
 
 class EditPartForm(HelperForm):
-    """ Form for editing a Part object """
+    """
+    Form for editing a Part object.
+    """
 
     field_prefix = {
         'keywords': 'fa-key',
@@ -202,14 +204,14 @@ class EditPartForm(HelperForm):
     class Meta:
         model = Part
         fields = [
-            'bom_copy',
-            'parameters_copy',
-            'confirm_creation',
             'category',
             'name',
             'IPN',
             'description',
             'revision',
+            'bom_copy',
+            'parameters_copy',
+            'confirm_creation',
             'keywords',
             'variant_of',
             'link',
@@ -217,6 +219,9 @@ class EditPartForm(HelperForm):
             'default_supplier',
             'units',
             'minimum_stock',
+            'trackable',
+            'purchaseable',
+            'salable',
         ]
 
 
diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index a3c11e5669..9711c9fbc8 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -203,6 +203,7 @@
             <td><i>{% trans "Part cannot be sold to customers" %}</i></td>
             {% endif %}
         </tr>
+        <tr><td colspan='4'></td></tr>
         <tr>
             <td>
                 {% if part.active %}
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index 2504b056c5..7961434af0 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -700,6 +700,11 @@ class PartCreate(AjaxCreateView):
             if label in self.request.GET:
                 initials[label] = self.request.GET.get(label)
 
+        # Default values for part options
+        initials['purchaseable'] = str2bool(InvenTreeSetting.get_setting('PART_PURCHASEABLE'))
+        initials['salable'] = str2bool(InvenTreeSetting.get_setting('PART_SALABLE'))
+        initials['trackable'] = str2bool(InvenTreeSetting.get_setting('PART_TRACKABLE'))
+
         return initials