diff --git a/src/blocks.ts b/src/blocks.ts
index c888c6c..ff41233 100644
--- a/src/blocks.ts
+++ b/src/blocks.ts
@@ -15,7 +15,7 @@ export default (editor: Editor, { blockCustomCode }: PluginOptions = {}) => {
     category: 'Extra',
     activate: true,
     select: true,
-    content: { type: typeCustomCode },
+    content: { type: typeCustomCode, attributes: { class: 'grapes-custom-code' } },
     ...blockCustomCode
   });
 }
diff --git a/src/components.ts b/src/components.ts
index bf4b16f..9a519c3 100644
--- a/src/components.ts
+++ b/src/components.ts
@@ -18,6 +18,7 @@ export default (editor: Editor, opts: PluginOptions = {}) => {
   });
 
   Components.addType(typeCustomCode, {
+    isComponent: el => el.className === 'grapes-custom-code',
     model: {
       defaults: {
         name: 'Custom Code',