diff --git a/services/web/frontend/js/ide.js b/services/web/frontend/js/ide.js
index f7b4e9ed4d..058b9ca479 100644
--- a/services/web/frontend/js/ide.js
+++ b/services/web/frontend/js/ide.js
@@ -266,7 +266,7 @@ If the project has been renamed please look in your project list for a new proje
           editorType,
         }
 
-        if (editorType === 'cm6') {
+        if (editorType === 'cm6' || editorType === 'cm6-rich-text') {
           const cm6PerfData = reportCM6Perf()
 
           // Ignore if no typing has happened
diff --git a/services/web/frontend/js/ide/editor/EditorManager.js b/services/web/frontend/js/ide/editor/EditorManager.js
index 68fa6322b4..48b8f5d9e4 100644
--- a/services/web/frontend/js/ide/editor/EditorManager.js
+++ b/services/web/frontend/js/ide/editor/EditorManager.js
@@ -162,7 +162,14 @@ export default EditorManager = (function () {
       if (!this.$scope.editor.sharejs_doc) {
         return null
       }
-      return this.$scope.editor.sharejs_doc.editorType()
+
+      let editorType = this.$scope.editor.sharejs_doc.editorType()
+
+      if (editorType === 'cm6' && this.$scope.editor.showVisual) {
+        editorType = 'cm6-rich-text'
+      }
+
+      return editorType
     }
 
     showRichText() {