diff --git a/lib/widget/category_display.dart b/lib/widget/category_display.dart
index 51c24f69..874ec168 100644
--- a/lib/widget/category_display.dart
+++ b/lib/widget/category_display.dart
@@ -40,22 +40,40 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
 
   @override
   List<Widget> getAppBarActions(BuildContext context) {
-    return <Widget>[
-      IconButton(
+
+    List<Widget> actions = [];
+
+    actions.add(
+        IconButton(
           icon: FaIcon(FontAwesomeIcons.search),
           onPressed: () {
+
+            Map<String, String> filters = {};
+
+            if (category != null) {
+              filters["category"] = "${category.pk}";
+            }
+
             showSearch(
                 context: context,
-                delegate: PartSearchDelegate(context, filters: {"category": "${category.pk}"})
+                delegate: PartSearchDelegate(context, filters: filters)
             );
           }
-      ),
-      IconButton(
-        icon: FaIcon(FontAwesomeIcons.edit),
-        tooltip: I18N.of(context).edit,
-        onPressed: _editCategoryDialog,
-      ),
-    ];
+        )
+    );
+
+    if (category != null) {
+      actions.add(
+        IconButton(
+          icon: FaIcon(FontAwesomeIcons.edit),
+          tooltip: I18N.of(context).edit,
+          onPressed: _editCategoryDialog,
+        )
+      );
+    }
+
+    return actions;
+
   }
 
   void _editCategory(Map<String, String> values) async {
@@ -63,7 +81,6 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
     final bool result = await category.update(context, values: values);
 
     showSnackIcon(
-      refreshableKey,
       result ? "Category edited" : "Category editing failed",
       success: result
     );
diff --git a/lib/widget/location_display.dart b/lib/widget/location_display.dart
index 5c26f418..50f13dd7 100644
--- a/lib/widget/location_display.dart
+++ b/lib/widget/location_display.dart
@@ -39,22 +39,39 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
 
   @override
   List<Widget> getAppBarActions(BuildContext context) {
-    return <Widget>[
+
+    List<Widget> actions = [];
+
+    actions.add(
       IconButton(
         icon: FaIcon(FontAwesomeIcons.search),
         onPressed: () {
+
+          Map<String, String> filters = {};
+
+          if (location != null) {
+            filters["location"] = "${location.pk}";
+          }
+
           showSearch(
             context: context,
-            delegate: StockSearchDelegate(context, filters: {"location": "${location.pk}"})
+            delegate: StockSearchDelegate(context, filters: filters)
           );
         }
       ),
-      IconButton(
-        icon: FaIcon(FontAwesomeIcons.edit),
-        tooltip: I18N.of(context).edit,
-        onPressed: _editLocationDialog,
-      )
-    ];
+    );
+
+    if (location != null) {
+      actions.add(
+        IconButton(
+          icon: FaIcon(FontAwesomeIcons.edit),
+          tooltip: I18N.of(context).edit,
+          onPressed: _editLocationDialog,
+        )
+      );
+    }
+
+    return actions;
   }
 
   void _editLocation(Map<String, String> values) async {
@@ -62,7 +79,6 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
     final bool result = await location.update(context, values: values);
 
     showSnackIcon(
-      refreshableKey,
       result ? "Location edited" : "Location editing failed",
       success: result
     );