diff --git a/org.eclipse.lsp4e/plugin.xml b/org.eclipse.lsp4e/plugin.xml
index 129b22dbe..2ad76b750 100644
--- a/org.eclipse.lsp4e/plugin.xml
+++ b/org.eclipse.lsp4e/plugin.xml
@@ -338,7 +338,7 @@
       <menuContribution allPopups="false" locationURI="toolbar:org.eclipse.ui.views.ContentOutline?after=additions">
          <command commandId="org.eclipse.lsp4e.toggleSortOutline" style="toggle" label="%command.toggle.outline.sort.label">
             <visibleWhen>
-               <reference definitionId="org.eclipse.lsp4e.activePartHasCNFOutlinePage" />
+               <reference definitionId="org.eclipse.lsp4e.activeEditorHasCNFOutlinePage" />
             </visibleWhen>
          </command>
       </menuContribution>
@@ -760,6 +760,15 @@
             </and>
          </with>
       </definition>
+      <definition
+            id="org.eclipse.lsp4e.activeEditorHasCNFOutlinePage">
+         <with
+               variable="activeEditor">
+            <test
+                  property="org.eclipse.lsp4e.hasCNFOutlinePage">
+            </test>
+         </with>
+      </definition>
       <definition id="org.eclipse.lsp4e.editorHasLanguageServer">
          <or>
             <with variable="editorInput">
diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/outline/HasCNFOutlinePage.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/outline/HasCNFOutlinePage.java
index b4528fb65..b42ac96f6 100644
--- a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/outline/HasCNFOutlinePage.java
+++ b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/outline/HasCNFOutlinePage.java
@@ -13,7 +13,9 @@
 
 import org.eclipse.core.expressions.PropertyTester;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 
 public class HasCNFOutlinePage extends PropertyTester {
 
@@ -22,6 +24,10 @@ public boolean test(@Nullable Object receiver, String property, Object[] args, @
 		if (receiver instanceof ContentOutline outline) {
 			return outline.getCurrentPage() instanceof CNFOutlinePage;
 		}
+		if (receiver instanceof IEditorPart editor) {
+			IContentOutlinePage outlinePage = editor.getAdapter(IContentOutlinePage.class);
+			return outlinePage instanceof CNFOutlinePage;
+		}
 		return false;
 	}