diff --git a/lib/widgets/add_exercise/steps/basics.dart b/lib/widgets/add_exercise/steps/basics.dart
index be89ade8..8cb9b593 100644
--- a/lib/widgets/add_exercise/steps/basics.dart
+++ b/lib/widgets/add_exercise/steps/basics.dart
@@ -46,6 +46,7 @@ class BasicStepContent extends StatelessWidget {
                 addExerciseProvider.alternateNamesEn = alternateName!.split('\n'),
           ),
           ExerciseCategoryInputWidget<ExerciseCategory>(
+            key: Key('category-dropdown'),
             entries: categories,
             title: '${AppLocalizations.of(context).category}*',
             callback: (ExerciseCategory newValue) {
@@ -59,6 +60,7 @@ class BasicStepContent extends StatelessWidget {
             displayName: (ExerciseCategory c) => getTranslation(c.name, context),
           ),
           AddExerciseMultiselectButton<Equipment>(
+            key: Key('equipment-multiselect'),
             title: AppLocalizations.of(context).equipment,
             items: equipment,
             initialItems: addExerciseProvider.equipment,
@@ -71,6 +73,7 @@ class BasicStepContent extends StatelessWidget {
             displayName: (Equipment e) => getTranslation(e.name, context),
           ),
           AddExerciseMultiselectButton<Muscle>(
+              key: Key('primary-muscles-multiselect'),
               title: AppLocalizations.of(context).muscles,
               items: muscles,
               initialItems: addExerciseProvider.primaryMuscles,
@@ -83,6 +86,7 @@ class BasicStepContent extends StatelessWidget {
               displayName: (Muscle e) =>
                   e.name + (e.nameEn.isNotEmpty ? '\n(${getTranslation(e.nameEn, context)})' : '')),
           AddExerciseMultiselectButton<Muscle>(
+            key: Key('secondary-muscles-multiselect'),
             title: AppLocalizations.of(context).musclesSecondary,
             items: muscles,
             initialItems: addExerciseProvider.secondaryMuscles,
diff --git a/lib/widgets/add_exercise/steps/translations.dart b/lib/widgets/add_exercise/steps/translations.dart
index 6a1eaf88..dc28e1f4 100644
--- a/lib/widgets/add_exercise/steps/translations.dart
+++ b/lib/widgets/add_exercise/steps/translations.dart
@@ -44,6 +44,7 @@ class _DescriptionTranslationStepContentState extends State<DescriptionTranslati
             Column(
               children: [
                 ExerciseCategoryInputWidget<Language>(
+                  key: Key('language-dropdown'),
                   entries: languages,
                   title: '${AppLocalizations.of(context).language}*',
                   displayName: (Language l) => l.fullName,
diff --git a/lib/widgets/exercises/forms.dart b/lib/widgets/exercises/forms.dart
index 97c1a1b4..ad5f8dc5 100644
--- a/lib/widgets/exercises/forms.dart
+++ b/lib/widgets/exercises/forms.dart
@@ -29,6 +29,7 @@ class ExerciseCategoryInputWidget<T> extends StatefulWidget {
   late final Function? _validator;
 
   ExerciseCategoryInputWidget({
+    Key? key,
     required String title,
     required List<T> entries,
     required Function callback,
@@ -54,6 +55,7 @@ class _ExerciseCategoryInputWidgetState<T> extends State<ExerciseCategoryInputWi
     return Padding(
       padding: const EdgeInsets.all(8.0),
       child: DropdownButtonFormField(
+        key: widget.key,
         value: selectedEntry,
         decoration: InputDecoration(
           labelText: widget._title,