diff --git a/InvenTree/order/templates/order/return_order_base.html b/InvenTree/order/templates/order/return_order_base.html
index 8d57c6c61c..faf0bd4340 100644
--- a/InvenTree/order/templates/order/return_order_base.html
+++ b/InvenTree/order/templates/order/return_order_base.html
@@ -35,6 +35,22 @@ src="{% static 'img/blank_image.png' %}"
 {% endif %}
 <!-- TODO: Printing actions -->
 <!-- TODO: Order actions-->
+
+{% if roles.return_order.change %}
+<!-- Order actions -->
+<div class='btn-group' role='group'>
+    <button id='order-options' title='{% trans "Order actions" %}' class='btn btn-outline-secondary dropdown-toggle' type='button' data-bs-toggle='dropdown'>
+        <span class='fas fa-tools'></span> <span class='caret'></span>
+    </button>
+    <ul class='dropdown-menu' role='menu'>
+        <li><a class='dropdown-item' href='#' id='edit-order'><span class='fas fa-edit icon-green'></span> {% trans "Edit order" %}</a></li>
+        {% if order.status == ReturnOrderStatus.PENDING %}
+        <li><a class='dropdown-item' href='#' id='cancel-order'><span class='fas fa-times-circle icon-red'></span> {% trans "Cancel order" %}</a></li>
+        {% endif %}
+    </ul>
+</div>
+{% endif %}
+
 {% endblock actions %}
 
 {% block details %}
@@ -104,7 +120,17 @@ src="{% static 'img/blank_image.png' %}"
 {% block js_ready %}
 {{ block.super }}
 
-<!-- TODO: Javascript callbacks -->
+{% if roles.return_order.change %}
+$('#edit-order').click(function() {
+    editReturnOrder({{ order.pk }}, {
+        reload: true,
+    });
+});
+
+$('#cancel-order').click(function() {
+    // TODO: Cancel order
+});
+{% endif %}
 
 {% if report_enabled %}
 <!-- TODO: Report callbacks -->
diff --git a/InvenTree/templates/js/translated/return_order.js b/InvenTree/templates/js/translated/return_order.js
index d5c2a163f4..1d61883357 100644
--- a/InvenTree/templates/js/translated/return_order.js
+++ b/InvenTree/templates/js/translated/return_order.js
@@ -20,41 +20,8 @@
 */
 
 /* exported
-    allocateStockToSalesOrder,
-    cancelPurchaseOrder,
-    cancelSalesOrder,
-    completePurchaseOrder,
-    completeSalesOrder,
-    completeSalesOrderShipment,
-    completePendingShipments,
-    createPurchaseOrder,
-    createPurchaseOrderLineItem,
     createReturnOrder,
-    createSalesOrder,
-    createSalesOrderLineItem,
-    createSalesOrderShipment,
-    duplicatePurchaseOrder,
-    editPurchaseOrder,
-    editPurchaseOrderLineItem,
-    editSalesOrder,
-    exportOrder,
-    issuePurchaseOrder,
-    loadPurchaseOrderLineItemTable,
-    loadPurchaseOrderExtraLineTable
-    loadPurchaseOrderTable,
     loadReturnOrderTable,
-    loadSalesOrderAllocationTable,
-    loadSalesOrderLineItemTable,
-    loadSalesOrderExtraLineTable
-    loadSalesOrderShipmentTable,
-    loadSalesOrderTable,
-    newPurchaseOrderFromOrderWizard,
-    newSupplierPartFromOrderWizard,
-    orderParts,
-    removeOrderRowFromOrderWizard,
-    removePurchaseOrderLineItem,
-    loadOrderTotal,
-    extraLineFields,
 */
 
 
@@ -113,6 +80,21 @@ function createReturnOrder(options={}) {
 }
 
 
+/*
+ * Edit an existing Return Order
+ */
+function editReturnOrder(order_id, options={}) {
+
+    constructForm(`/api/order/return/${order_id}/`, {
+        fields: returnOrderFields(options),
+        title: '{% trans "Edit Return Order" %}',
+        onSuccess: function(response) {
+            handleFormSuccess(response, options);
+        }
+    });
+}
+
+
 /*
  * Load a table of return orders
  */