diff --git a/lib/api_form.dart b/lib/api_form.dart
index 432e49cc..f8e335d9 100644
--- a/lib/api_form.dart
+++ b/lib/api_form.dart
@@ -977,7 +977,7 @@ Future<void> launchApiForm(
       IconData icon = TablerIcons.device_floppy
     }) async {
 
-  showLoadingOverlay(context);
+  showLoadingOverlay();
 
   // List of fields defined by the server
   Map<String, dynamic> serverFields = {};
@@ -1229,7 +1229,7 @@ class _APIFormWidgetState extends State<APIFormWidget> {
 
     if (widget.method == "POST") {
 
-      showLoadingOverlay(context);
+      showLoadingOverlay();
       final response =  await InvenTreeAPI().post(
         widget.url,
         body: data,
@@ -1240,7 +1240,7 @@ class _APIFormWidgetState extends State<APIFormWidget> {
       return response;
 
     } else {
-      showLoadingOverlay(context);
+      showLoadingOverlay();
       final response = await InvenTreeAPI().patch(
         widget.url,
         body: data,
diff --git a/lib/barcode/controller.dart b/lib/barcode/controller.dart
index 559bac9a..7a1fb1f8 100644
--- a/lib/barcode/controller.dart
+++ b/lib/barcode/controller.dart
@@ -65,7 +65,7 @@ class InvenTreeBarcodeControllerState extends State<InvenTreeBarcodeController>
       context = OneContext.hasContext ? OneContext().context : null;
     }
 
-    showLoadingOverlay(context);
+    showLoadingOverlay();
     await pauseScan();
 
     await widget.handler.processBarcode(data);
diff --git a/lib/inventree/purchase_order.dart b/lib/inventree/purchase_order.dart
index f57dd135..82cb0f34 100644
--- a/lib/inventree/purchase_order.dart
+++ b/lib/inventree/purchase_order.dart
@@ -3,6 +3,7 @@ import "package:inventree/helpers.dart";
 import "package:inventree/inventree/company.dart";
 import "package:inventree/inventree/model.dart";
 import "package:inventree/inventree/orders.dart";
+import "package:inventree/widget/progress.dart";
 
 
 /*
@@ -121,7 +122,9 @@ class InvenTreePurchaseOrder extends InvenTreeOrder {
       return;
     }
 
+    showLoadingOverlay();
     await api.post("${url}issue/", expectedStatusCode: 201);
+    hideLoadingOverlay();
   }
 
   /// Mark this order as "cancelled"
@@ -130,7 +133,9 @@ class InvenTreePurchaseOrder extends InvenTreeOrder {
       return;
     }
 
+    showLoadingOverlay();
     await api.post("${url}cancel/", expectedStatusCode: 201);
+    hideLoadingOverlay();
   }
 }
 
diff --git a/lib/inventree/sales_order.dart b/lib/inventree/sales_order.dart
index b1ee37fb..9acc374b 100644
--- a/lib/inventree/sales_order.dart
+++ b/lib/inventree/sales_order.dart
@@ -6,6 +6,7 @@ import "package:inventree/inventree/model.dart";
 import "package:inventree/inventree/orders.dart";
 
 import "package:inventree/api.dart";
+import "package:inventree/widget/progress.dart";
 
 
 /*
@@ -76,7 +77,9 @@ class InvenTreeSalesOrder extends InvenTreeOrder {
       return;
     }
 
+    showLoadingOverlay();
     await api.post("${url}issue/", expectedStatusCode: 201);
+    hideLoadingOverlay();
   }
 
   /// Mark this order as "cancelled"
@@ -85,7 +88,9 @@ class InvenTreeSalesOrder extends InvenTreeOrder {
       return;
     }
 
+    showLoadingOverlay();
     await api.post("${url}cancel/", expectedStatusCode: 201);
+    hideLoadingOverlay();
   }
 
   int get customerId => getInt("customer");
diff --git a/lib/labels.dart b/lib/labels.dart
index 4d053bad..1e15bd4a 100644
--- a/lib/labels.dart
+++ b/lib/labels.dart
@@ -98,7 +98,7 @@ Future<void> selectAndPrintLabel(
 
       if (labelId != -1 && pluginKey != null) {
 
-        showLoadingOverlay(context);
+        showLoadingOverlay();
 
         if (InvenTreeAPI().supportsModernLabelPrinting) {
 
diff --git a/lib/settings/app_settings.dart b/lib/settings/app_settings.dart
index 7b6b08de..8eba55bd 100644
--- a/lib/settings/app_settings.dart
+++ b/lib/settings/app_settings.dart
@@ -50,7 +50,7 @@ class _InvenTreeAppSettingsState extends State<InvenTreeAppSettingsWidget> {
 
   Future <void> loadSettings(BuildContext context) async {
 
-    showLoadingOverlay(context);
+    showLoadingOverlay();
 
     barcodeSounds = await InvenTreeSettingsManager().getValue(INV_SOUNDS_BARCODE, true) as bool;
     serverSounds = await InvenTreeSettingsManager().getValue(INV_SOUNDS_SERVER, true) as bool;
diff --git a/lib/settings/login.dart b/lib/settings/login.dart
index d580b1d1..908d09a5 100644
--- a/lib/settings/login.dart
+++ b/lib/settings/login.dart
@@ -50,7 +50,7 @@ class _InvenTreeLoginState extends State<InvenTreeLoginWidget> {
         currentFocus.unfocus();
       }
 
-      showLoadingOverlay(context);
+      showLoadingOverlay();
 
       // Attempt login
       final response = await InvenTreeAPI().fetchToken(widget.profile, username, password);
diff --git a/lib/widget/attachment_widget.dart b/lib/widget/attachment_widget.dart
index ab9c61c2..42f3e84c 100644
--- a/lib/widget/attachment_widget.dart
+++ b/lib/widget/attachment_widget.dart
@@ -79,7 +79,7 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
 
     if (file == null) return;
 
-    showLoadingOverlay(context);
+    showLoadingOverlay();
 
     final bool result = await widget.attachmentClass.uploadAttachment(
         file,
@@ -178,7 +178,7 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
           subtitle: Text(attachment.comment),
           leading: Icon(attachment.icon, color: COLOR_ACTION),
           onTap: () async {
-            showLoadingOverlay(context);
+            showLoadingOverlay();
             await attachment.downloadAttachment();
             hideLoadingOverlay();
           },
diff --git a/lib/widget/company/supplier_part_detail.dart b/lib/widget/company/supplier_part_detail.dart
index 2b6a9d4c..c6c50468 100644
--- a/lib/widget/company/supplier_part_detail.dart
+++ b/lib/widget/company/supplier_part_detail.dart
@@ -119,7 +119,7 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
           leading: Icon(TablerIcons.box, color: COLOR_ACTION),
           trailing: InvenTreeAPI().getThumbnail(widget.supplierPart.partImage),
           onTap: () async {
-            showLoadingOverlay(context);
+            showLoadingOverlay();
             final part = await InvenTreePart().get(widget.supplierPart.partId);
             hideLoadingOverlay();
 
@@ -162,7 +162,7 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
         leading: Icon(TablerIcons.building, color: COLOR_ACTION),
         trailing: InvenTreeAPI().getThumbnail(widget.supplierPart.supplierImage),
         onTap: () async {
-          showLoadingOverlay(context);
+          showLoadingOverlay();
           var supplier = await InvenTreeCompany().get(widget.supplierPart.supplierId);
           hideLoadingOverlay();
 
@@ -193,7 +193,7 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
           leading: Icon(TablerIcons.building_factory_2, color: COLOR_ACTION),
           trailing: InvenTreeAPI().getThumbnail(widget.supplierPart.manufacturerImage),
           onTap: () async {
-            showLoadingOverlay(context);
+            showLoadingOverlay();
             var supplier = await InvenTreeCompany().get(widget.supplierPart.manufacturerId);
             hideLoadingOverlay();
 
diff --git a/lib/widget/order/po_line_detail.dart b/lib/widget/order/po_line_detail.dart
index 4482a942..06e0a735 100644
--- a/lib/widget/order/po_line_detail.dart
+++ b/lib/widget/order/po_line_detail.dart
@@ -175,7 +175,7 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
       fields["location"]?["value"] = destination;
     }
 
-    showLoadingOverlay(context);
+    showLoadingOverlay();
     var order = await InvenTreePurchaseOrder().get(widget.item.orderId);
     hideLoadingOverlay();
 
@@ -210,7 +210,7 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
         leading: Icon(TablerIcons.box, color: COLOR_ACTION),
         trailing: api.getThumbnail(widget.item.partImage),
         onTap: () async {
-          showLoadingOverlay(context);
+          showLoadingOverlay();
           var part = await InvenTreePart().get(widget.item.partId);
           hideLoadingOverlay();
 
@@ -228,7 +228,7 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
         subtitle: Text(widget.item.SKU),
         leading: Icon(TablerIcons.building, color: COLOR_ACTION),
         onTap: () async {
-          showLoadingOverlay(context);
+          showLoadingOverlay();
           var part = await InvenTreeSupplierPart().get(widget.item.supplierPartId);
           hideLoadingOverlay();
 
diff --git a/lib/widget/order/po_line_list.dart b/lib/widget/order/po_line_list.dart
index e7f53d4b..94c0d92d 100644
--- a/lib/widget/order/po_line_list.dart
+++ b/lib/widget/order/po_line_list.dart
@@ -77,7 +77,7 @@ class _PaginatedPOLineListState extends PaginatedSearchState<PaginatedPOLineList
         trailing: Text(item.progressString, style: TextStyle(color: item.isComplete ? COLOR_SUCCESS : COLOR_WARNING)),
         leading: InvenTreeAPI().getThumbnail(supplierPart.partImage),
         onTap: () async {
-          showLoadingOverlay(context);
+          showLoadingOverlay();
           await item.reload();
           hideLoadingOverlay();
           Navigator.push(context, MaterialPageRoute(builder: (context) => POLineDetailWidget(item)));
diff --git a/lib/widget/order/purchase_order_detail.dart b/lib/widget/order/purchase_order_detail.dart
index f4a45d07..297bc46a 100644
--- a/lib/widget/order/purchase_order_detail.dart
+++ b/lib/widget/order/purchase_order_detail.dart
@@ -185,7 +185,7 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
       color: Colors.blue,
       acceptText: L10().issue,
       onAccept: () async {
-        await widget.order.issueOrder().then((dynamic) {
+        widget.order.issueOrder().then((dynamic) {
           refresh(context);
         });
       }
@@ -201,7 +201,7 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
       color: Colors.red,
       acceptText: L10().cancel,
       onAccept: () async {
-        await widget.order.cancelOrder().then((dynamic) {
+        widget.order.cancelOrder().then((dynamic) {
           refresh(context);
         });
       }
diff --git a/lib/widget/order/sales_order_detail.dart b/lib/widget/order/sales_order_detail.dart
index 54c6800d..72c51c70 100644
--- a/lib/widget/order/sales_order_detail.dart
+++ b/lib/widget/order/sales_order_detail.dart
@@ -127,7 +127,7 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
         color: Colors.blue,
         acceptText: L10().issue,
         onAccept: () async {
-          await widget.order.issueOrder().then((dynamic) {
+          widget.order.issueOrder().then((dynamic) {
             refresh(context);
           });
         }
diff --git a/lib/widget/order/so_line_detail.dart b/lib/widget/order/so_line_detail.dart
index c2d41817..9dcd218b 100644
--- a/lib/widget/order/so_line_detail.dart
+++ b/lib/widget/order/so_line_detail.dart
@@ -187,7 +187,7 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
         leading: Icon(TablerIcons.box, color: COLOR_ACTION),
         trailing: api.getThumbnail(widget.item.partImage),
         onTap: () async {
-          showLoadingOverlay(context);
+          showLoadingOverlay();
           var part = await InvenTreePart().get(widget.item.partId);
           hideLoadingOverlay();
 
diff --git a/lib/widget/order/so_line_list.dart b/lib/widget/order/so_line_list.dart
index 11ba2273..a4c74548 100644
--- a/lib/widget/order/so_line_list.dart
+++ b/lib/widget/order/so_line_list.dart
@@ -65,7 +65,7 @@ class _PaginatedSOLineListState extends PaginatedSearchState<PaginatedSOLineList
         leading: InvenTreeAPI().getThumbnail(part.thumbnail),
         trailing: Text(item.progressString, style: TextStyle(color: item.isComplete ? COLOR_SUCCESS : COLOR_WARNING)),
         onTap: () async {
-          showLoadingOverlay(context);
+          showLoadingOverlay();
           await item.reload();
           hideLoadingOverlay();
           Navigator.push(
diff --git a/lib/widget/part/bom_list.dart b/lib/widget/part/bom_list.dart
index b599a628..9dcbe664 100644
--- a/lib/widget/part/bom_list.dart
+++ b/lib/widget/part/bom_list.dart
@@ -154,7 +154,7 @@ class _PaginatedBomListState extends PaginatedSearchState<PaginatedBomList> {
       leading: InvenTreeAPI().getThumbnail(subPart?.thumbnail ?? ""),
       onTap: subPart == null ? null : () async {
 
-        showLoadingOverlay(context);
+        showLoadingOverlay();
         var part = await InvenTreePart().get(subPart.pk);
         hideLoadingOverlay();
 
diff --git a/lib/widget/part/category_display.dart b/lib/widget/part/category_display.dart
index bc7ab089..79dd6025 100644
--- a/lib/widget/part/category_display.dart
+++ b/lib/widget/part/category_display.dart
@@ -159,7 +159,7 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
                   Navigator.push(context, MaterialPageRoute(builder: (context) => CategoryDisplayWidget(null)));
                 } else {
 
-                  showLoadingOverlay(context);
+                  showLoadingOverlay();
                   var cat = await InvenTreePartCategory().get(parentId);
                   hideLoadingOverlay();
 
diff --git a/lib/widget/part/part_detail.dart b/lib/widget/part/part_detail.dart
index 4718e6eb..0e2f2ca6 100644
--- a/lib/widget/part/part_detail.dart
+++ b/lib/widget/part/part_detail.dart
@@ -366,7 +366,7 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
             onTap: () async {
               if (part.categoryId > 0) {
 
-                showLoadingOverlay(context);
+                showLoadingOverlay();
                 var cat = await InvenTreePartCategory().get(part.categoryId);
                 hideLoadingOverlay();
 
@@ -646,7 +646,7 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
 
     if (part.isTrackable) {
       // read the next available serial number
-      showLoadingOverlay(context);
+      showLoadingOverlay();
       var response = await api.get("/api/part/${part.pk}/serial-numbers/", expectedStatusCode: null);
       hideLoadingOverlay();
 
diff --git a/lib/widget/part/part_parameter_widget.dart b/lib/widget/part/part_parameter_widget.dart
index ea7e7dfc..53e772da 100644
--- a/lib/widget/part/part_parameter_widget.dart
+++ b/lib/widget/part/part_parameter_widget.dart
@@ -127,7 +127,7 @@ class _PaginatedParameterState extends PaginatedSearchState<PaginatedParameterLi
           value: parameter.as_bool,
           onChanged: (bool value) {
             if (parameter.canEdit) {
-              showLoadingOverlay(context);
+              showLoadingOverlay();
               parameter.update(
                 values: {
                   "data": value.toString()
diff --git a/lib/widget/progress.dart b/lib/widget/progress.dart
index ff13ceea..618941b3 100644
--- a/lib/widget/progress.dart
+++ b/lib/widget/progress.dart
@@ -3,6 +3,7 @@
 import "package:flutter/material.dart";
 import "package:flutter_overlay_loader/flutter_overlay_loader.dart";
 import "package:inventree/app_colors.dart";
+import "package:one_context/one_context.dart";
 
 
 /*
@@ -42,7 +43,9 @@ Widget progressIndicator() {
 }
 
 
-void showLoadingOverlay(BuildContext? context) {
+void showLoadingOverlay() {
+
+  BuildContext? context = OneContext().context;
 
   if (context == null) {
     return;
diff --git a/lib/widget/stock/location_display.dart b/lib/widget/stock/location_display.dart
index df294739..42e8907f 100644
--- a/lib/widget/stock/location_display.dart
+++ b/lib/widget/stock/location_display.dart
@@ -362,7 +362,7 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
                   Navigator.push(context, MaterialPageRoute(
                       builder: (context) => LocationDisplayWidget(null)));
                 } else {
-                  showLoadingOverlay(context);
+                  showLoadingOverlay();
                   var loc = await InvenTreeStockLocation().get(parentId);
                   hideLoadingOverlay();
 
diff --git a/lib/widget/stock/stock_detail.dart b/lib/widget/stock/stock_detail.dart
index 106d0509..00817089 100644
--- a/lib/widget/stock/stock_detail.dart
+++ b/lib/widget/stock/stock_detail.dart
@@ -523,7 +523,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
         onTap: () async {
           if (widget.item.partId > 0) {
 
-            showLoadingOverlay(context);
+            showLoadingOverlay();
             var part = await InvenTreePart().get(widget.item.partId);
             hideLoadingOverlay();
 
@@ -566,7 +566,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
           onTap: () async {
             if (widget.item.locationId > 0) {
 
-              showLoadingOverlay(context);
+              showLoadingOverlay();
               var loc = await InvenTreeStockLocation().get(widget.item.locationId);
               hideLoadingOverlay();
 
@@ -651,7 +651,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
           leading: Icon(TablerIcons.building, color: COLOR_ACTION),
           trailing: InvenTreeAPI().getThumbnail(widget.item.supplierImage, hideIfNull: true),
           onTap: () async {
-            showLoadingOverlay(context);
+            showLoadingOverlay();
             var sp = await InvenTreeSupplierPart().get(
                 widget.item.supplierPartId);
             hideLoadingOverlay();