diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/QuickClassBrowser.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/QuickClassBrowser.cs
index 843bac1fef..5e7f176696 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/QuickClassBrowser.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/QuickClassBrowser.cs
@@ -88,6 +88,14 @@ namespace ICSharpCode.AvalonEdit.AddIn
 					return r;
 				return string.Compare(text, other.text, StringComparison.Ordinal);
 			}
+			
+			/// <summary>
+			/// ToString override is necessary to support keyboard navigation in WPF
+			/// </summary>
+			public override string ToString()
+			{
+				return text;
+			}
 		}
 		
 		public QuickClassBrowser()