diff --git a/assets/release_notes.md b/assets/release_notes.md
index 69f1c693..689e5879 100644
--- a/assets/release_notes.md
+++ b/assets/release_notes.md
@@ -7,6 +7,7 @@
 - Support custom icons for part category
 - Support custom icons for stock location
 - Adjustments to notification messages
+- Assorted bug fixes
 - Updated translations
 
 ### 0.9.1 - December 2022
diff --git a/lib/settings/login.dart b/lib/settings/login.dart
index 279540e4..abccf9b0 100644
--- a/lib/settings/login.dart
+++ b/lib/settings/login.dart
@@ -1,5 +1,6 @@
 import "package:flutter/material.dart";
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
+import "package:one_context/one_context.dart";
 
 import "package:inventree/app_colors.dart";
 import "package:inventree/widget/dialogs.dart";
@@ -143,8 +144,7 @@ class _InvenTreeLoginSettingsState extends State<InvenTreeLoginSettingsWidget> {
             _selectProfile(context, profile);
           },
           onLongPress: () {
-            showDialog(
-                context: context,
+            OneContext().showDialog(
                 builder: (BuildContext context) {
                   return SimpleDialog(
                     title: Text(profile.name),
diff --git a/lib/widget/attachment_widget.dart b/lib/widget/attachment_widget.dart
index 892e72a7..b137d9ab 100644
--- a/lib/widget/attachment_widget.dart
+++ b/lib/widget/attachment_widget.dart
@@ -3,6 +3,9 @@ import "dart:io";
 
 import "package:flutter/material.dart";
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
+import "package:one_context/one_context.dart";
+import "package:url_launcher/url_launcher.dart";
+
 import "package:inventree/app_colors.dart";
 import "package:inventree/inventree/model.dart";
 import "package:inventree/widget/fields.dart";
@@ -10,7 +13,6 @@ import "package:inventree/widget/progress.dart";
 import "package:inventree/widget/snacks.dart";
 import "package:inventree/widget/refreshable_state.dart";
 import "package:inventree/l10.dart";
-import "package:url_launcher/url_launcher.dart";
 
 /*
  * A generic widget for displaying a list of attachments.
@@ -99,8 +101,7 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
    * Display an option context menu for the selected attachment
    */
   Future<void> showOptionsMenu(BuildContext context, InvenTreeAttachment attachment) async {
-    showDialog(
-      context: context,
+    OneContext().showDialog(
       builder: (BuildContext ctx) {
         return SimpleDialog(
           title: Text(L10().attachments),
diff --git a/lib/widget/purchase_order_detail.dart b/lib/widget/purchase_order_detail.dart
index 49cf9db6..3b9a1540 100644
--- a/lib/widget/purchase_order_detail.dart
+++ b/lib/widget/purchase_order_detail.dart
@@ -258,6 +258,9 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
     );
   }
 
+  /*
+   * Display a context menu for a particular PurhaseOrderLineItem
+   */
   void lineItemMenu(BuildContext context, InvenTreePOLineItem lineItem) {
 
     List<Widget> children = [];
@@ -303,8 +306,7 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
 
     children.insert(0, Divider());
 
-    showDialog(
-      context: context,
+    OneContext().showDialog(
       builder: (BuildContext context) {
         return SimpleDialog(
           title: Text(L10().lineItem),