diff --git a/Manager/Views/Demos/DemoListView.xaml b/Manager/Views/Demos/DemoListView.xaml
index 8896629a2..72df55980 100644
--- a/Manager/Views/Demos/DemoListView.xaml
+++ b/Manager/Views/Demos/DemoListView.xaml
@@ -57,7 +57,7 @@
                                              Text="{x:Static properties:Resources.Analyze}" />
                     <controls:ButtonWithIcon Icon="TextBox"
                                              Command="{Binding ShowDemoDetailsCommand}"
-                                             CommandParameter="{Binding SelectedValue, ElementName=DataGridDemos}"
+                                             CommandParameter="{Binding SelectedDemos}"
                                              ToolTip="{x:Static properties:Resources.ToolTipDemoDetails}"
                                              Text="{x:Static properties:Resources.Details}" />
                     <controls:ButtonWithIcon Icon="Reload"
@@ -66,7 +66,7 @@
                                              Text="{x:Static properties:Resources.Refresh}" />
                     <controls:ButtonWithIcon Icon="MicrosoftWindows"
                                              Command="{Binding BrowseToDemoCommand}"
-                                             CommandParameter="{Binding SelectedValue, ElementName=DataGridDemos}"
+                                             CommandParameter="{Binding SelectedDemos}"
                                              ToolTip="{x:Static properties:Resources.ToolTipBrowseToDemo}"
                                              Text="{x:Static properties:Resources.Browse}" />
                     <controls:ButtonWithIcon Icon="Delete"