diff --git a/ILSpy/Metadata/Helpers.cs b/ILSpy/Metadata/Helpers.cs
index add2fbd15..cd6558a17 100644
--- a/ILSpy/Metadata/Helpers.cs
+++ b/ILSpy/Metadata/Helpers.cs
@@ -136,6 +136,7 @@ namespace ICSharpCode.ILSpy.Metadata
 				{
 					return new DataGridCheckBoxColumn() {
 						Header = e.PropertyName,
+						SortMemberPath = e.PropertyName,
 						Binding = binding
 					};
 				}
@@ -146,12 +147,14 @@ namespace ICSharpCode.ILSpy.Metadata
 				{
 					return new DataGridTemplateColumn() {
 						Header = e.PropertyName,
+						SortMemberPath = e.PropertyName,
 						CellTemplate = GetOrCreateLinkCellTemplate(e.PropertyName, descriptor, binding)
 					};
 				}
 
 				return new DataGridTextColumn() {
 					Header = e.PropertyName,
+					SortMemberPath = e.PropertyName,
 					Binding = binding
 				};
 			}
diff --git a/ILSpy/Metadata/HexFilterControl.xaml.cs b/ILSpy/Metadata/HexFilterControl.xaml.cs
index 9a50e0bed..26f4d5ea7 100644
--- a/ILSpy/Metadata/HexFilterControl.xaml.cs
+++ b/ILSpy/Metadata/HexFilterControl.xaml.cs
@@ -73,6 +73,8 @@ namespace ICSharpCode.ILSpy.Metadata
 
 			public bool IsMatch(object value)
 			{
+				if (string.IsNullOrWhiteSpace(filter))
+					return true;
 				if (value == null)
 					return false;