diff --git a/editors/editoria/src/config/config.js b/editors/editoria/src/config/config.js
index 3741df534b6644e3383637cd5f2ed4ac7b6217fc..f50b1261157cda554446798acb9172b5b373841c 100644
--- a/editors/editoria/src/config/config.js
+++ b/editors/editoria/src/config/config.js
@@ -40,6 +40,7 @@ import {
   TransformToolGroupService,
   TrackOptionsService,
   TrackOptionsToolGroupService,
+  TrackCommentOptionsToolGroupService,
 } from 'wax-prosemirror-services';
 
 import { DefaultSchema } from 'wax-prosemirror-utilities';
@@ -90,20 +91,7 @@ export default {
     },
     {
       templateArea: 'commentTrackToolBar',
-      toolGroups: [
-        {
-          name: 'Annotations',
-          more: [
-            'Superscript',
-            'Subscript',
-            'SmallCaps',
-            'Emphasis',
-            'Code',
-            'Underline',
-            'StrikeThrough',
-          ],
-        },
-      ],
+      toolGroups: ['TrackCommentOptions'],
     },
     {
       templateArea: 'BottomRightInfo',
@@ -183,7 +171,7 @@ export default {
     new BottomInfoService(),
     new TransformService(),
     new TransformToolGroupService(),
-    new TrackOptionsService(),
     new TrackOptionsToolGroupService(),
+    new TrackCommentOptionsToolGroupService(),
   ],
 };
diff --git a/wax-prosemirror-services/index.js b/wax-prosemirror-services/index.js
index a9096c81b3f2839aff782fb2616b4c623f187f6b..b24641719a829158f0b1aa57f0ee357141213f64 100644
--- a/wax-prosemirror-services/index.js
+++ b/wax-prosemirror-services/index.js
@@ -59,3 +59,4 @@ export { default as TextHighlightToolGroupServices } from './src/WaxToolGroups/T
 export { default as EditorInfoToolGroupServices } from './src/WaxToolGroups/BottomToolGroupService/InfoToolGroupService/EditorInfoToolGroupService';
 export { default as TransformToolGroupService } from './src/WaxToolGroups/TransformToolGroupService/TransformToolGroupService';
 export { default as TrackOptionsToolGroupService } from './src/WaxToolGroups/TrackOptionsToolGroupService/TrackOptionsToolGroupService';
+export { default as TrackCommentOptionsToolGroupService } from './src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptionsToolGroupService';
diff --git a/wax-prosemirror-services/src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptions.js b/wax-prosemirror-services/src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptions.js
new file mode 100644
index 0000000000000000000000000000000000000000..71947e2f7574c72dc7de863cfc8899f23208ef7a
--- /dev/null
+++ b/wax-prosemirror-services/src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptions.js
@@ -0,0 +1,35 @@
+import React, { useMemo } from 'react';
+import { injectable, inject } from 'inversify';
+import { BlockLevelTools, Tabs, ToolGroups } from 'wax-prosemirror-components';
+import { isEmpty } from 'lodash';
+import styled from 'styled-components';
+import { v4 as uuidv4 } from 'uuid';
+import ToolGroup from '../../lib/ToolGroup';
+
+const Empty = styled.div`
+  background: khaki;
+  height: 100%;
+`;
+
+@injectable()
+class TrackCommentOptions extends ToolGroup {
+  tools = [];
+  toolGroups = [];
+
+  constructor(@inject('TrackOptions') trackOptions, @inject('Text') text) {
+    super();
+    this.toolGroups = [
+      {
+        groups: [trackOptions, text],
+      },
+    ];
+  }
+
+  renderTools(view) {
+    if (isEmpty(view)) return null;
+
+    return <span>Options</span>;
+  }
+}
+
+export default TrackCommentOptions;
diff --git a/wax-prosemirror-services/src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptionsToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptionsToolGroupService.js
new file mode 100644
index 0000000000000000000000000000000000000000..107f82bc7d61b783b247be68cb2cbce536a43029
--- /dev/null
+++ b/wax-prosemirror-services/src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptionsToolGroupService.js
@@ -0,0 +1,10 @@
+import Service from '../../Service';
+import TrackCommentOptions from './TrackCommentOptions';
+
+class TrackCommentOptionsToolGroupService extends Service {
+  register() {
+    this.container.bind('TrackCommentOptions').to(TrackCommentOptions);
+  }
+}
+
+export default TrackCommentOptionsToolGroupService;