diff --git a/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml b/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml
index a65e330a41..e55c4a9c69 100644
--- a/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml
+++ b/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml
@@ -24,7 +24,8 @@
-
+
+
diff --git a/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml.cs b/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml.cs
index 6621c0eab4..47111adadf 100644
--- a/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml.cs
+++ b/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml.cs
@@ -14,6 +14,10 @@ public sealed partial class GridViewPage : Page, System.ComponentModel.INotifyPr
public GridViewPage()
{
InitializeComponent();
+
+ // TODO: Moving from x:Bind to Binding as workaround for https://github.com/Microsoft/WindowsTemplateStudio/issues/496
+ // Once Telerik fix the root cause, we get back to x:Bind and remove the following line
+ DataContext = this;
}
public ObservableCollection Source
diff --git a/templates/Pages/Grid/Views/GridViewPage.xaml b/templates/Pages/Grid/Views/GridViewPage.xaml
index cbf9c27f88..6648320b12 100644
--- a/templates/Pages/Grid/Views/GridViewPage.xaml
+++ b/templates/Pages/Grid/Views/GridViewPage.xaml
@@ -24,7 +24,8 @@
-
+
+