diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index 5cee2f4426..da5524fb39 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -135,7 +135,7 @@
 <div class='panel panel-hidden' id='panel-part-notes'>
     <div class='panel-heading'>
         <div class='d-flex flex-wrap'>
-            <h4>{% trans "Notes" %}</h4>
+            <h4>{% trans "Part Notes" %}</h4>
             {% include "spacer.html" %}
             <div class='btn-group' role='group'>
                 {% include "notes_buttons.html" %}
@@ -418,7 +418,7 @@
             'part-notes',
             '{% url "api-part-detail" part.pk %}',
             {
-                editable: true,
+                editable: {% if roles.part.change %}true{% else %}false{% endif %},
             }
         );
     });
diff --git a/InvenTree/stock/templates/stock/item.html b/InvenTree/stock/templates/stock/item.html
index 40d99577f9..632f9e523a 100644
--- a/InvenTree/stock/templates/stock/item.html
+++ b/InvenTree/stock/templates/stock/item.html
@@ -133,24 +133,16 @@
 
 <div class='panel panel-hidden' id='panel-notes'>
     <div class='panel-heading'>
-        <div class='row'>
-            <div class='col-sm-6'>
-                <h4>{% trans "Stock Item Notes" %}</h4>
-            </div>
-            <div class='col-sm-6'>
-                <div class='btn-group float-right'>
-                    <button type='button' id='edit-notes' title='{% trans "Edit Notes" %}' class='btn btn-small btn-outline-secondary'>
-                        <span class='fas fa-edit'>      
-                        </span>
-                    </button>
-                </div>
+        <div class='d-flex flex-wrap'>
+            <h4>{% trans "Stock Item Notes" %}</h4>
+            {% include "spacer.html" %}
+            <div class='btn-group' role='group'>
+                {% include "notes_buttons.html" %}
             </div>
         </div>
     </div>
     <div class='panel-content'>
-        {% if item.notes %}
-        {{ item.notes | markdownify }}
-        {% endif %}
+        <textarea id='stock-notes'></textarea>
     </div>
 </div>
 
@@ -235,18 +227,21 @@
                 reload: true,
             }
         );
-    });
 
-    $('#edit-notes').click(function() {
-        constructForm('{% url "api-stock-detail" item.pk %}', {
-            fields: {
-                notes: {
-                    multiline: true,
-                }
-            },
-            title: '{% trans "Edit Notes" %}',
-            reload: true,
-        });
+    });
+    
+    onPanelLoad('notes', function() {
+        setupNotesField(
+            'stock-notes',
+            '{% url "api-stock-detail" item.pk %}',
+            {
+                {% if roles.stock.change and user_owns_item %}
+                editable: true,
+                {% else %}
+                editable: false,
+                {% endif %}
+            }
+        );
     });
 
     enableDragAndDrop(