diff --git a/demo.html b/demo.html
index 800dfed0e..4fca9642b 100644
--- a/demo.html
+++ b/demo.html
@@ -18,6 +18,7 @@
     <script src="js/grapes.min.js?v0.13.8"></script>
     <script src="js/grapesjs-preset-webpage.min.js"></script>
     <script src="js/grapesjs-lory-slider.min.js?0.1.5"></script>
+    <script src="js/grapesjs-tabs.min.js?0.1.1"></script>
 
     <style type="text/css">
         .icon-add-comp::before, .icon-comp100::before,.icon-comp50::before,.icon-comp30::before,.icon-rm::before{ content: '';}
@@ -975,13 +976,18 @@
           assets: images
         },
         styleManager: { clearProperties: 1 },
-        plugins: ['gjs-preset-webpage', 'grapesjs-lory-slider'],
+        plugins: ['gjs-preset-webpage', 'grapesjs-lory-slider', 'grapesjs-tabs'],
         pluginsOpts: {
           'grapesjs-lory-slider': {
             sliderBlock: {
               category: 'Extra'
             }
           },
+          'grapesjs-tabs': {
+            tabsBlock: {
+              category: 'Extra'
+            }
+          },
           'gjs-preset-webpage': {
             modalImportTitle: 'Import Template',
             modalImportLabel: '<div style="margin-bottom: 10px; font-size: 13px;">Paste here your HTML/CSS and click Import</div>',
diff --git a/img/tabs.gif b/img/tabs.gif
new file mode 100644
index 000000000..f4ce30e27
Binary files /dev/null and b/img/tabs.gif differ
diff --git a/js/grapesjs-tabs.min.js b/js/grapesjs-tabs.min.js
new file mode 100644
index 000000000..61ffc3d96
--- /dev/null
+++ b/js/grapesjs-tabs.min.js
@@ -0,0 +1,2 @@
+/*! grapesjs-tabs - 0.1.1 */
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("grapesjs")):"function"==typeof define&&define.amd?define(["grapesjs"],e):"object"==typeof exports?exports["grapesjs-tabs"]=e(require("grapesjs")):t["grapesjs-tabs"]=e(t.grapesjs)}(this,function(t){return function(t){function e(a){if(n[a])return n[a].exports;var r=n[a]={i:a,l:!1,exports:{}};return t[a].call(r.exports,r,r.exports,e),r.l=!0,r.exports}var n={};return e.m=t,e.c=n,e.d=function(t,n,a){e.o(t,n)||Object.defineProperty(t,n,{configurable:!1,enumerable:!0,get:a})},e.n=function(t){var n=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(n,"a",n),n},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=0)}([function(t,e,n){"use strict";function a(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0});var r=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var a in n)Object.prototype.hasOwnProperty.call(n,a)&&(t[a]=n[a])}return t},o=n(1),i=a(o),s=n(2),l=a(s),c=n(7),d=a(c);e.default=i.default.plugins.add("grapesjs-tabs",function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=r({tabsBlock:{},tabsProps:{},tabProps:{},tabContentProps:{},tabContainerProps:{},attrTabs:"data-tabs",attrTab:"data-tab",attrTabContent:"data-tab-content",attrTabContainer:"data-tab-container",classTab:"tab",classTabActive:"tab-active",classTabContent:"tab-content",classTabContainer:"tab-container",selectorTab:"href",template:'\n      <nav data-tab-container>\n        <a href="#tab1" data-tab>Tab 1</a>\n        <a href="#tab2" data-tab>Tab 2</a>\n        <a href="#tab3" data-tab>Tab 3</a>\n      </nav>\n      <div id="tab1" data-tab-content>\n        <div>Tab 1 Content</div>\n      </div>\n      <div id="tab2" data-tab-content>\n        <div>Tab 2 Content</div>\n      </div>\n      <div id="tab3" data-tab-content>\n        <div>Tab 3 Content</div>\n      </div>\n    ',templateTabContent:"<div>New Tab Content</div>",style:"\n      .tab {\n        text-decoration: none;\n        color: inherit;\n        padding: 7px 14px;\n        transition: opacity 0.3s;\n        display: inline-block;\n        border-radius: 3px;\n        margin-right: 10px;\n      }\n\n      .tab.tab-active {\n        background-color: #0d94e6;\n        color: white;\n      }\n\n      .tab-content {\n        padding: 6px 12px;\n        min-height: 100px;\n        animation: fadeEffect 1s;\n      }\n\n      @keyframes fadeEffect {\n        from {opacity: 0;}\n        to {opacity: 1;}\n      }\n    "},e);(0,l.default)(t,n),(0,d.default)(t,n),t.on("load",function(){return t.addComponents('<div style="margin:0 100px; padding:25px;">Content loaded from the plugin</div>')})})},function(e,n){e.exports=t},function(t,e,n){"use strict";function a(t){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,"__esModule",{value:!0});var r=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var a in n)Object.prototype.hasOwnProperty.call(n,a)&&(t[a]=n[a])}return t},o=n(3),i=a(o),s=n(4),l=a(s),c=n(5),d=a(c),u=n(6),b=a(u);e.default=function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.DomComponents,a=n.getType("default"),o=n.getType("link"),s=a.model,c=a.view,u=o.model,f=o.view,p=r({},e,{defaultModel:s,defaultView:c,linkModel:u,linkView:f});(0,i.default)(n,p),(0,l.default)(n,p),(0,d.default)(n,p),(0,b.default)(n,p)}},function(t,e,n){"use strict";function a(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function r(t,e){var n={};for(var a in t)e.indexOf(a)>=0||Object.prototype.hasOwnProperty.call(t,a)&&(n[a]=t[a]);return n}Object.defineProperty(e,"__esModule",{value:!0});var o=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var a in n)Object.prototype.hasOwnProperty.call(n,a)&&(t[a]=n[a])}return t};e.default=function(t,e){var n=e.linkModel,i=e.linkView,s=r(e,["linkModel","linkView"]),l=s.attrTab,c=s.classTab,d=s.selectorTab;t.addType("tab",{model:n.extend({defaults:o({},n.prototype.defaults,{name:"Tab",draggable:"["+s.attrTabContainer+"]",droppable:!1},s.tabProps),init:function(){var t=this.getAttributes();t[l]=1,this.setAttributes(t),c&&this.addClass(c)},clone:function(){var t=n.prototype.clone.apply(this,arguments);return t.addAttributes(a({},d,"")),t}},{isComponent:function(t){if(t.hasAttribute&&t.hasAttribute(l))return{type:"tab"}}}),view:i})}},function(t,e,n){"use strict";function a(t,e){var n={};for(var a in t)e.indexOf(a)>=0||Object.prototype.hasOwnProperty.call(t,a)&&(n[a]=t[a]);return n}Object.defineProperty(e,"__esModule",{value:!0});var r=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var a in n)Object.prototype.hasOwnProperty.call(n,a)&&(t[a]=n[a])}return t};e.default=function(t,e){var n=e.defaultModel,o=e.defaultView,i=a(e,["defaultModel","defaultView"]),s=i.attrTabs;t.addType("tabs",{model:n.extend({defaults:r({},n.prototype.defaults,{name:"Tabs","attr-tabs":i.attrTabs,"attr-tab":i.attrTab,"attr-tab-content":i.attrTabContent,"class-tab-active":i.classTabActive,"selector-tab":i.selectorTab,script:function(){var t,e=this,n="[{[ attr-tab ]}]",a=document.body,r=a.matchesSelector||a.webkitMatchesSelector||a.mozMatchesSelector||a.msMatchesSelector,o=function(){var n=e.querySelectorAll("[{[ attr-tab-content ]}]")||[];for(t=0;t<n.length;t++)n[t].style.display="none"},i=function(a){var r=e.querySelectorAll(n)||[];for(t=0;t<r.length;t++){var i=r[t],s=i.className.replace("{[ class-tab-active ]}","").trim();i.className=s}o(),a.className+=" {[ class-tab-active ]}";var l=a.getAttribute("{[ selector-tab ]}"),c=e.querySelector(l);c&&(c.style.display="")},s=e.querySelector(".{[ class-tab-active ]}"+n);s=s||e.querySelector(n),s&&i(s),e.addEventListener("click",function(t){var e=t.target;r.call(e,n)&&i(e)})}},i.tabsProps),init:function(){var t=this.getAttributes();t[i.attrTabs]=1,this.setAttributes(t)}},{isComponent:function(t){if(t.hasAttribute&&t.hasAttribute(s))return{type:"tabs"}}}),view:o.extend({init:function(){var t=this.model.components();!t.length&&t.add(i.template)},onRender:function(){var t=this.model.find("["+i.attrTabContainer+"]")[0];t&&t.components().each(function(e){t.onAdd(e)})}})})}},function(t,e,n){"use strict";function a(t,e){var n={};for(var a in t)e.indexOf(a)>=0||Object.prototype.hasOwnProperty.call(t,a)&&(n[a]=t[a]);return n}Object.defineProperty(e,"__esModule",{value:!0});var r=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var a in n)Object.prototype.hasOwnProperty.call(n,a)&&(t[a]=n[a])}return t};e.default=function(t,e){var n=e.defaultModel,o=e.defaultView,i=a(e,["defaultModel","defaultView"]),s=i.attrTabContent,l=i.classTabContent;t.addType("tab-content",{model:n.extend({defaults:r({},n.prototype.defaults,{name:"Tab Content",draggable:!1,copyable:!1,removable:!1},i.tabContentProps),init:function(){var t=this.getAttributes();t[s]=1,this.setAttributes(t),l&&this.addClass(l)}},{isComponent:function(t){if(t.hasAttribute&&t.hasAttribute(s))return{type:"tab-content"}}}),view:o})}},function(t,e,n){"use strict";function a(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function r(t,e){var n={};for(var a in t)e.indexOf(a)>=0||Object.prototype.hasOwnProperty.call(t,a)&&(n[a]=t[a]);return n}Object.defineProperty(e,"__esModule",{value:!0});var o=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var a in n)Object.prototype.hasOwnProperty.call(n,a)&&(t[a]=n[a])}return t};e.default=function(t,e){var n=e.defaultModel,i=e.defaultView,s=r(e,["defaultModel","defaultView"]),l="tab-container",c=s.attrTabs,d=s.attrTabContainer,u=s.classTabContainer,b=s.selectorTab;t.addType(l,{model:n.extend({defaults:o({},n.prototype.defaults,{name:"Tab Container",draggable:"["+c+"]",droppable:"["+s.attrTab+"]",copyable:!1,removable:!1},s.tabContainerProps),init:function(){var t=this.getAttributes();t[d]=1,this.setAttributes(t),u&&this.addClass(u);var e=this.components();this.listenTo(e,"add",this.onAdd),this.listenTo(e,"remove",this.onRemove)},onRemove:function(t,e){var n=(arguments.length>2&&void 0!==arguments[2]&&arguments[2],t.tabContent);n&&setTimeout(function(){var e=t.collection,a=n.collection;!e&&a&&a.remove(n)},0)},onAdd:function(t,e){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r=(this.components(),t.getAttributes());if(!t.tabContent&&!n.avoidStore){var o=r[b],i=this.closest("["+c+"]"),l=(i.view,o&&i.view.$el.find(o));if(l.length)t.tabContent=l.data("model");else{var d=i.components().add({type:"tab-content",components:s.templateTabContent}),u=d.getId();d.addAttributes({id:u}),t.addAttributes(a({},b,"#"+u)),t.tabContent=d,d.getEl().style.display="none"}}}},{isComponent:function(t){if(t.hasAttribute&&t.hasAttribute(d))return{type:l}}}),view:i})}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var a=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var a in n)Object.prototype.hasOwnProperty.call(n,a)&&(t[a]=n[a])}return t};e.default=function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.BlockManager,r=e.tabsBlock,o=e.style,i='<div data-gjs-type="tabs"></div>\n    '+(o?"<style>"+o+"</style>":"");r&&n.add("tabs",a({label:'\n      <svg class="gjs-block-svg" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">\n        <g fill-rule="evenodd">\n          <path d="M22 9.3c0-.8-.5-1.3-1.3-1.3H3.4C2.5 8 2 8.5 2 9.3v7.4c0 .8.5 1.3 1.3 1.3h17.4c.8 0 1.3-.5 1.3-1.3V9.3zM21 17H3V9h18v8z" fill-rule="nonzero"/><rect x="3" y="5" width="4" height="2" rx=".5"/><rect x="8" y="5" width="4" height="2" rx=".5"/><rect x="13" y="5" width="4" height="2" rx=".5"/>\n        </g>\n      </svg>\n      <div class="gjs-block-label">Tabs</div>\n    ',content:i},r))}}])});
\ No newline at end of file