1 files changed, 9 insertions, 15 deletions
diff --git a/app/assets/javascripts/content_editor/components/bubble_menus/formatting.vue b/app/assets/javascripts/content_editor/components/bubble_menus/formatting.vue
index f0726ff3e63..05ca7fd75c3 100644
--- a/app/assets/javascripts/content_editor/components/bubble_menus/formatting.vue
+++ b/app/assets/javascripts/content_editor/components/bubble_menus/formatting.vue
@@ -3,13 +3,11 @@ import { GlButtonGroup } from '@gitlab/ui';
 import { BubbleMenu } from '@tiptap/vue-2';
 import { BUBBLE_MENU_TRACKING_ACTION } from '../../constants';
 import trackUIControl from '../../services/track_ui_control';
-import Image from '../../extensions/image';
+import Paragraph from '../../extensions/paragraph';
+import Heading from '../../extensions/heading';
 import Audio from '../../extensions/audio';
 import Video from '../../extensions/video';
-import Code from '../../extensions/code';
-import CodeBlockHighlight from '../../extensions/code_block_highlight';
-import Diagram from '../../extensions/diagram';
-import Frontmatter from '../../extensions/frontmatter';
+import Image from '../../extensions/image';
 import ToolbarButton from '../toolbar_button.vue';
 
 export default {
@@ -27,17 +25,13 @@ export default {
     shouldShow: ({ editor, from, to }) => {
       if (from === to) return false;
 
-      const exclude = [
-        Code.name,
-        CodeBlockHighlight.name,
-        Diagram.name,
-        Frontmatter.name,
-        Image.name,
-        Audio.name,
-        Video.name,
-      ];
+      const includes = [Paragraph.name, Heading.name];
+      const excludes = [Image.name, Audio.name, Video.name];
 
-      return !exclude.some((type) => editor.isActive(type));
+      return (
+        includes.some((type) => editor.isActive(type)) &&
+        !excludes.some((type) => editor.isActive(type))
+      );
     },
   },
 };