[1049876] [Scaffolding] Use LabelWidget for input controls

1 files changed, 3 insertions, 2 deletions

diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderTemplateConfigurePage.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderTemplateConfigurePage.cs
index cac84828a8..0eb0175f06 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderTemplateConfigurePage.cs
+++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderTemplateConfigurePage.cs
@@ -62,6 +62,7 @@ namespace MonoDevelop.AspNetCore.Scaffolding
 					table.Add (input, 1, rowIndex);
 					input.Changed += (sender, args) => s.SelectedValue = input.Text;
 					input.MinWidth = 300;
+					input.Accessible.LabelWidget = label;
 					input.SetFocus ();
 					break;
 				case ComboField comboField:
@@ -100,9 +101,8 @@ namespace MonoDevelop.AspNetCore.Scaffolding
 					table.Add (label, 0, rowIndex, hpos: WidgetPlacement.End);
 					table.Add (comboBox, 1, rowIndex);
 					comboBox.TextInput += (sender, args) => comboField.SelectedValue = comboBox.SelectedText;
-
 					comboBox.SelectionChanged += (sender, args) => comboField.SelectedValue = comboBox.SelectedText;
-
+					comboBox.Accessible.LabelWidget = label;
 					break;
 				case BoolFieldList boolFieldList:
 					label.Text = boolFieldList.DisplayName;
@@ -132,6 +132,7 @@ namespace MonoDevelop.AspNetCore.Scaffolding
 					rowAdditionCount++;
 					fileSelector.HeightRequest = 20;
 					fileSelector.FileChanged += (sender, args) => fileField.SelectedValue = fileSelector.FileName;
+					fileSelector.Accessible.LabelWidget = label;
 					break;
 				}