diff --git a/wax-prosemirror-components/src/components/ToolGroupComponent.js b/wax-prosemirror-components/src/components/ToolGroupComponent.js
index 26c069f4bfd514725c006fd398052f4964246e47..3b53be6d6ca988c77a3fb8f3beb8ab4ba0ff49a5 100644
--- a/wax-prosemirror-components/src/components/ToolGroupComponent.js
+++ b/wax-prosemirror-components/src/components/ToolGroupComponent.js
@@ -31,7 +31,7 @@ const ToolGroupComponent = ({ view, tools, name, title }) => {
     DisplayTitle = isFunction(title) ? title : () => title;
 
   tools.forEach(tool => {
-    tool.hideOnToolbar
+    tool.hideOnToolbar && tool.isDisplayed()
       ? rest.push(tool.renderTool(view))
       : toolsShown.push(tool.renderTool(view));
   });
diff --git a/wax-prosemirror-services/src/lib/ToolGroup.js b/wax-prosemirror-services/src/lib/ToolGroup.js
index 6cbadb4b0cf1befcb1a25e01071668fed155a0d0..8ef865de8e809246c476fff06a1cefb71ee7b285 100644
--- a/wax-prosemirror-services/src/lib/ToolGroup.js
+++ b/wax-prosemirror-services/src/lib/ToolGroup.js
@@ -20,13 +20,13 @@ export default class ToolGroup {
         if (include.includes(tool.constructor.name)) {
           tool.displayTool();
         } else {
-          tool.notDisplayTool();
+          tool.hideTool();
         }
       });
     } else {
       this._tools.map(tool => {
         if (exclude.includes(tool.constructor.name)) {
-          tool.notDisplayTool();
+          tool.hideTool();
         }
       });
     }
diff --git a/wax-prosemirror-services/src/lib/Tools.js b/wax-prosemirror-services/src/lib/Tools.js
index d203e25720def225c877048c18f6f285553268b4..efd25c82487ac80fa84743b9cbbb6316e21b3fd4 100644
--- a/wax-prosemirror-services/src/lib/Tools.js
+++ b/wax-prosemirror-services/src/lib/Tools.js
@@ -55,11 +55,15 @@ export default class Tools {
     ) : null;
   }
 
-  notDisplayTool() {
+  displayTool() {
+    this._isDisplayed = true;
+  }
+
+  hideTool() {
     this._isDisplayed = false;
   }
 
-  displayTool() {
-    this._isDisplayed = true;
+  isDisplayed() {
+    return this._isDisplayed;
   }
 }