diff --git a/lib/widget/category_display.dart b/lib/widget/category_display.dart
index 0f68703f..f1f02823 100644
--- a/lib/widget/category_display.dart
+++ b/lib/widget/category_display.dart
@@ -169,7 +169,7 @@ class _CategoryDisplayState extends State<CategoryDisplayWidget> {
                     );
                   },
                   body: SubcategoryList(_subcategories),
-                  isExpanded: _subcategoriesExpanded,
+                  isExpanded: _subcategoriesExpanded && _subcategories.length > 0,
                 ),
                 ExpansionPanel(
                   headerBuilder: (BuildContext context, bool isExpanded) {
@@ -185,7 +185,7 @@ class _CategoryDisplayState extends State<CategoryDisplayWidget> {
                     );
                   },
                   body: PartList(_parts),
-                  isExpanded: _partListExpanded,
+                  isExpanded: _partListExpanded && _parts.length > 0,
                 )
               ],
             ),
diff --git a/lib/widget/location_display.dart b/lib/widget/location_display.dart
index 49654ffb..8cfd141c 100644
--- a/lib/widget/location_display.dart
+++ b/lib/widget/location_display.dart
@@ -176,7 +176,7 @@ class _LocationDisplayState extends State<LocationDisplayWidget> {
                   );
                 },
                 body: SublocationList(_sublocations),
-                isExpanded: _locationListExpanded,
+                isExpanded: _locationListExpanded && _sublocations.length > 0,
               ),
               ExpansionPanel(
                 headerBuilder: (BuildContext context, bool isExpanded) {
@@ -192,7 +192,7 @@ class _LocationDisplayState extends State<LocationDisplayWidget> {
                   );
                 },
                 body: StockList(_items),
-                isExpanded: _stockListExpanded,
+                isExpanded: _stockListExpanded && _items.length > 0,
               )
             ]
           ),