diff --git a/form_app/lib/src/autofill.dart b/form_app/lib/src/autofill.dart
index 8d038c5a8..9e881b860 100644
--- a/form_app/lib/src/autofill.dart
+++ b/form_app/lib/src/autofill.dart
@@ -45,6 +45,7 @@ class _AutofillDemoState extends State<AutofillDemo> {
                       autofillHints: [AutofillHints.familyName],
                     ),
                     TextField(
+                      keyboardType: TextInputType.emailAddress,
                       decoration: InputDecoration(
                         hintText: 'foo@example.com',
                         labelText: 'Email',
@@ -52,6 +53,7 @@ class _AutofillDemoState extends State<AutofillDemo> {
                       autofillHints: [AutofillHints.email],
                     ),
                     TextField(
+                      keyboardType: TextInputType.phone,
                       decoration: InputDecoration(
                         hintText: '(123) 456-7890',
                         labelText: 'Telephone',
@@ -59,6 +61,7 @@ class _AutofillDemoState extends State<AutofillDemo> {
                       autofillHints: <String>[AutofillHints.telephoneNumber],
                     ),
                     TextField(
+                      keyboardType: TextInputType.streetAddress,
                       decoration: InputDecoration(
                         hintText: '123 4th Ave',
                         labelText: 'Street Address',
@@ -66,6 +69,7 @@ class _AutofillDemoState extends State<AutofillDemo> {
                       autofillHints: <String>[AutofillHints.streetAddressLine1],
                     ),
                     TextField(
+                      keyboardType: TextInputType.number,
                       decoration: InputDecoration(
                         hintText: '12345',
                         labelText: 'Postal Code',
@@ -80,6 +84,7 @@ class _AutofillDemoState extends State<AutofillDemo> {
                       autofillHints: <String>[AutofillHints.countryName],
                     ),
                     TextField(
+                      keyboardType: TextInputType.number,
                       decoration: InputDecoration(
                         hintText: '1',
                         labelText: 'Country Code',