diff --git a/lib/pages/vehicles_on_the_property/vehicles_on_the_property.dart b/lib/pages/vehicles_on_the_property/vehicles_on_the_property.dart
index 180c672b..edbd968b 100644
--- a/lib/pages/vehicles_on_the_property/vehicles_on_the_property.dart
+++ b/lib/pages/vehicles_on_the_property/vehicles_on_the_property.dart
@@ -121,12 +121,10 @@ class _VehiclePageState extends State<VehiclePage>
 
     if (_model.isEditing & isFirst) {
       _model.handleEditingChanged(false);
-      setState(() {});
     }
-    // if (isFirst) FocusScope.of(context).unfocus();
     if (isFirst) {
-      FocusScope.of(context).unfocus();
-      // FocusScope.of(context).nextFocus();
+      FocusScope.of(context).nextFocus();
+      setState(() {});
     }
   }