diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml b/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml
index 18da3c039..c8673c321 100644
--- a/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml
+++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillRowEditor.xaml
@@ -65,6 +65,7 @@
SecurityMap="{DynamicResource ResourceKey={x:Static usp:ManualFillRowEditor.SecuritiesKey}}"
SelectedSecurity="{Binding security}"
ShowDialogSkirt="True"
+ ToolTip="{Binding SelectedCriteria, RelativeSource={RelativeSource Self}, Converter={x:Static c:ContractPickerPopup.SecurityCriteriaTextConverter}, Mode=OneWay}"
/>
diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillsView.xaml b/src/client/spark/Modules/Trading/ManualFills/ManualFillsView.xaml
index 22f954abb..1b16271ff 100644
--- a/src/client/spark/Modules/Trading/ManualFills/ManualFillsView.xaml
+++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillsView.xaml
@@ -145,6 +145,7 @@
SecurityMap="{Binding DataContext.security_map, RelativeSource={RelativeSource AncestorType=DataGrid}, Mode=OneWay}"
SelectedSecurity="{Binding security, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
ShowDialogSkirt="True"
+ ToolTip="{Binding SelectedCriteria, RelativeSource={RelativeSource Self}, Converter={x:Static c:ContractPickerPopup.SecurityCriteriaTextConverter}, Mode=OneWay}"
/>
diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsView.xaml b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsView.xaml
index be5ca7445..88fd35b7f 100644
--- a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsView.xaml
+++ b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsView.xaml
@@ -230,6 +230,7 @@
SelectedCriteria="{Binding value}"
SecurityMap="{Binding Path='[security_map]', UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
Header="{Binding SelectedCriteria, RelativeSource={RelativeSource Self}}"
+ ToolTip="{Binding SelectedCriteria, RelativeSource={RelativeSource Self}, Converter={x:Static c:ContractPickerPopup.SecurityCriteriaTextConverter}, Mode=OneWay}"
/>
diff --git a/src/client/spark/view/Spark/ContractPicker/ContractPickerPopup.xaml b/src/client/spark/view/Spark/ContractPicker/ContractPickerPopup.xaml
index 6bc4b493e..35af16a13 100644
--- a/src/client/spark/view/Spark/ContractPicker/ContractPickerPopup.xaml
+++ b/src/client/spark/view/Spark/ContractPicker/ContractPickerPopup.xaml
@@ -5,7 +5,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sp="clr-namespace:mbts.spark"
xmlns:c="clr-namespace:mbts.ui.controls"
- ToolTip="{Binding SelectedCriteria, RelativeSource={RelativeSource Self}, Converter={x:Static c:ContractPickerPopup.SecurityCriteriaTextConverter}, Mode=OneWay}"
ShowExpanderArrow="False"
Padding="2,0"
>