diff --git a/Codist/NaviBar/NaviBarFactory.cs b/Codist/NaviBar/NaviBarFactory.cs
index 26424a46..16803a7f 100644
--- a/Codist/NaviBar/NaviBarFactory.cs
+++ b/Codist/NaviBar/NaviBarFactory.cs
@@ -29,7 +29,8 @@ sealed partial class NaviBarFactory : IWpfTextViewCreationListener
 #pragma warning restore 649, 169
 
 		public void TextViewCreated(IWpfTextView textView) {
-			if (Config.Instance.Features.MatchFlags(Features.NaviBar)) {
+			if (Config.Instance.Features.MatchFlags(Features.NaviBar)
+				&& textView.Roles.Contains("DIFF") == false) {
 				if (textView.TextBuffer.ContentType.IsOfType(Constants.CodeTypes.CSharp)) {
 					textView.Properties.GetOrCreateSingletonProperty(() => new SemanticContext(textView));
 					new Overrider(textView);