diff --git a/avatar_maker/lib/src/customizer/widgets/customizer_body.dart b/avatar_maker/lib/src/customizer/widgets/customizer_body.dart
index 8b491be..ad68809 100644
--- a/avatar_maker/lib/src/customizer/widgets/customizer_body.dart
+++ b/avatar_maker/lib/src/customizer/widgets/customizer_body.dart
@@ -52,6 +52,8 @@ class CustomizerBody extends StatelessWidget {
 
       /// Build the main Tile Grid with all the options from the attribute
       var _tileGrid = GridView.builder(
+        key: PageStorageKey(propertyCategory.id),
+        primary: true,
         physics: theme.scrollPhysics,
         itemCount: attributeListLength,
         gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(