diff --git a/lib/presentation/views/settings_view.dart b/lib/presentation/views/settings_view.dart
index 7c1df2e..72365ea 100644
--- a/lib/presentation/views/settings_view.dart
+++ b/lib/presentation/views/settings_view.dart
@@ -51,10 +51,10 @@ class _SettingsViewState extends State<SettingsView> {
                       margin: EdgeInsets.zero,
                       children: [
                         CustomFormRow(
-                          key: _stepperKey1,
                           prefixText: 'Cabo-Strafe',
                           prefixIcon: CupertinoIcons.minus_square,
                           suffixWidget: Stepper(
+                            key: _stepperKey1,
                             initialValue: ConfigService.caboPenalty,
                             minValue: 0,
                             maxValue: 50,
@@ -68,10 +68,10 @@ class _SettingsViewState extends State<SettingsView> {
                           ),
                         ),
                         CustomFormRow(
-                          key: _stepperKey2,
                           prefixText: 'Punkte-Limit',
                           prefixIcon: FontAwesomeIcons.bullseye,
                           suffixWidget: Stepper(
+                            key: _stepperKey2,
                             initialValue: ConfigService.pointLimit,
                             minValue: 30,
                             maxValue: 1000,
diff --git a/lib/presentation/widgets/custom_form_row.dart b/lib/presentation/widgets/custom_form_row.dart
index f03b453..7a266ae 100644
--- a/lib/presentation/widgets/custom_form_row.dart
+++ b/lib/presentation/widgets/custom_form_row.dart
@@ -24,11 +24,11 @@ class _CustomFormRowState extends State<CustomFormRow> {
   @override
   void initState() {
     super.initState();
-    suffixWidget = widget.suffixWidget ?? const SizedBox.shrink();
   }
 
   @override
   Widget build(BuildContext context) {
+    suffixWidget = widget.suffixWidget ?? const SizedBox.shrink();
     return CupertinoButton(
       padding: EdgeInsets.zero,
       onPressed: widget.onPressed,
diff --git a/pubspec.yaml b/pubspec.yaml
index e393fb9..7b8621b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: cabo_counter
 description: "Mobile app for the card game Cabo"
 publish_to: 'none'
 
-version: 0.4.0+380
+version: 0.4.0+381
 
 environment:
   sdk: ^3.5.4