diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py
index deaf2a799a..40eac96a81 100644
--- a/InvenTree/part/models.py
+++ b/InvenTree/part/models.py
@@ -284,7 +284,7 @@ class Part(models.Model):
 
         # If this part does NOT have a BOM, result is simply the currently available stock
         if not self.has_bom:
-            return self.available_stock
+            return 0
 
         total = None
 
diff --git a/InvenTree/static/script/inventree/stock.js b/InvenTree/static/script/inventree/stock.js
index 3241550ec7..44f563aa51 100644
--- a/InvenTree/static/script/inventree/stock.js
+++ b/InvenTree/static/script/inventree/stock.js
@@ -293,6 +293,8 @@ function moveStockItems(items, options) {
             //modalSetContent(modal, html);
             attachSelect(modal);
 
+            modalEnable(modal, true);
+
             $(modal).find('#note-warning').hide();
 
             modalSubmit(modal, function() {
diff --git a/InvenTree/stock/forms.py b/InvenTree/stock/forms.py
index a94156ad29..c040c58fce 100644
--- a/InvenTree/stock/forms.py
+++ b/InvenTree/stock/forms.py
@@ -32,13 +32,10 @@ class CreateStockItemForm(HelperForm):
             'part',
             'supplier_part',
             'location',
-            'belongs_to',
-            'serial',
             'batch',
             'quantity',
             'status',
             'notes',
-            # 'customer',
             'URL',
         ]
 
@@ -67,7 +64,13 @@ class StocktakeForm(forms.ModelForm):
 
 
 class EditStockItemForm(HelperForm):
-    """ Form for editing a StockItem object """
+    """ Form for editing a StockItem object.
+    Note that not all fields can be edited here (even if they can be specified during creation.
+    
+    location - Must be updated in a 'move' transaction
+    quantity - Must be updated in a 'stocktake' transaction
+    part - Cannot be edited after creation
+    """
 
     class Meta:
         model = StockItem