diff --git a/src/RichToolbar.js b/src/RichToolbar.js
index d2d4ac1..cc70f1a 100755
--- a/src/RichToolbar.js
+++ b/src/RichToolbar.js
@@ -114,7 +114,7 @@ export default class RichToolbar extends Component {
     if (this.editor && items !== selectedItems) {
       this.setState({
         items,
-        data: this.state.actions.map(action => ({action, selected: items.includes(action)})),
+        data: this.state.actions.map(action => ({action, selected: items.includes(action) || items.some(item => item && item.type === action)})),
       });
     }
   }