diff --git a/app/assets/javascripts/components/NotesOptions/changeEditor/createEditorMenuGroups.ts b/app/assets/javascripts/components/NotesOptions/changeEditor/createEditorMenuGroups.ts
index c2a56e096..1b59c6358 100644
--- a/app/assets/javascripts/components/NotesOptions/changeEditor/createEditorMenuGroups.ts
+++ b/app/assets/javascripts/components/NotesOptions/changeEditor/createEditorMenuGroups.ts
@@ -59,11 +59,13 @@ export const createEditorMenuGroups = (
         feature.area === ComponentArea.Editor
     )
     .forEach((editorFeature) => {
-      if (
-        !editors.find(
-          (editor) => editor.identifier === editorFeature.identifier
-        )
-      ) {
+      const notInstalled = !editors.find(
+        (editor) => editor.identifier === editorFeature.identifier
+      );
+      const isExperimental = application.features.isExperimentalFeature(
+        editorFeature.identifier
+      );
+      if (notInstalled && !isExperimental) {
         editorItems[getEditorGroup(editorFeature)].push({
           name: editorFeature.name as string,
           isEntitled: false,
diff --git a/app/assets/javascripts/preferences/panes/General.tsx b/app/assets/javascripts/preferences/panes/General.tsx
index a616c2d07..6492cd496 100644
--- a/app/assets/javascripts/preferences/panes/General.tsx
+++ b/app/assets/javascripts/preferences/panes/General.tsx
@@ -19,7 +19,9 @@ export const General: FunctionComponent<GeneralProps> = observer(
       <Tools application={application} />
       <Defaults application={application} />
       <ErrorReporting appState={appState} />
-      <LabsPane application={application} />
+      {appState.enableUnfinishedFeatures && (
+        <LabsPane application={application} />
+      )}
       <Advanced
         application={application}
         appState={appState}