diff --git a/widget/form.go b/widget/form.go
index 7ca8628f7d..4911756fe2 100644
--- a/widget/form.go
+++ b/widget/form.go
@@ -69,7 +69,7 @@ func (f *Form) AppendItem(item *FormItem) {
 	f.Items = append(f.Items, item)
 	if f.itemGrid != nil {
 		f.itemGrid.Add(f.createLabel(item.Text))
-		f.itemGrid.Add(item.Widget)
+		f.itemGrid.Add(f.createInput(item))
 		f.setUpValidation(item.Widget, len(f.Items)-1)
 	}
 
diff --git a/widget/form_test.go b/widget/form_test.go
index 5404320cae..086b00baf6 100644
--- a/widget/form_test.go
+++ b/widget/form_test.go
@@ -300,3 +300,30 @@ func TestForm_Disable_Validation(t *testing.T) {
 
 	test.AssertImageMatches(t, "form/disable_validation_disabled_valid.png", w.Canvas().Capture())
 }
+
+func TestForm_HintsRendered(t *testing.T) {
+	app := test.NewApp()
+	defer test.NewApp()
+	app.Settings().SetTheme(theme.LightTheme())
+
+	f := NewForm()
+
+	fi1 := NewFormItem("Form Item 1", NewEntry())
+	fi1.HintText = "HT1"
+	f.AppendItem(fi1)
+
+	fi2 := NewFormItem("Form Item 2", NewEntry())
+	fi2.HintText = "HT2"
+
+	f.AppendItem(fi2)
+
+	fi3 := NewFormItem("Form Item 3", NewEntry())
+	fi3.HintText = "HT3"
+
+	f.AppendItem(fi3)
+
+	w := test.NewWindow(f)
+	defer w.Close()
+
+	test.AssertImageMatches(t, "form/hints_rendered.png", w.Canvas().Capture())
+}
diff --git a/widget/testdata/form/hints_rendered.png b/widget/testdata/form/hints_rendered.png
new file mode 100644
index 0000000000..a62a2137d2
Binary files /dev/null and b/widget/testdata/form/hints_rendered.png differ