diff --git a/apps/editor/src/js/ui/codeBlockGadget.js b/apps/editor/src/js/ui/codeBlockGadget.js
index d94d8b8a63..204e8ed6ef 100644
--- a/apps/editor/src/js/ui/codeBlockGadget.js
+++ b/apps/editor/src/js/ui/codeBlockGadget.js
@@ -41,7 +41,7 @@ class CodeBlockGadget extends BlockOverlay {
     this.$el.addClass('code-block-header');
     this._$languageLabel = $('<span>text</span>');
     this.$el.append(this._$languageLabel);
-    this._$buttonOpenModalEditor = $(`<button>Editor</button>`);
+    this._$buttonOpenModalEditor = $(`<button type="button">Editor</button>`);
     this.$el.append(this._$buttonOpenModalEditor);
   }
 
diff --git a/apps/editor/src/js/ui/popupCodeBlockEditor.js b/apps/editor/src/js/ui/popupCodeBlockEditor.js
index 010ef08d0f..43db57f2b2 100644
--- a/apps/editor/src/js/ui/popupCodeBlockEditor.js
+++ b/apps/editor/src/js/ui/popupCodeBlockEditor.js
@@ -17,10 +17,10 @@ const CLASS_OK_BUTTON = 'te-ok-button';
 const CLASS_CLOSE_BUTTON = 'te-close-button';
 const CLASS_POPUP_CLOSE_BUTTON = 'tui-popup-close-button';
 const TEMPLATE_HEADER_BUTTONS = `
-    <button class="${CLASS_PREFIX}toggle-scroll"></button>
-    <button class="${CLASS_PREFIX}toggle-preview"></button>
-    <button class="${CLASS_PREFIX}toggle-fit"></button>
-    <button class="${CLASS_POPUP_CLOSE_BUTTON}"></button>
+    <button type="button" class="${CLASS_PREFIX}toggle-scroll"></button>
+    <button type="button" class="${CLASS_PREFIX}toggle-preview"></button>
+    <button type="button" class="${CLASS_PREFIX}toggle-fit"></button>
+    <button type="button" class="${CLASS_POPUP_CLOSE_BUTTON}"></button>
 `;
 
 /**
diff --git a/apps/editor/test/ui/layerpopup.spec.js b/apps/editor/test/ui/layerpopup.spec.js
index 6068548c5e..21128d2497 100644
--- a/apps/editor/test/ui/layerpopup.spec.js
+++ b/apps/editor/test/ui/layerpopup.spec.js
@@ -167,8 +167,8 @@ describe('LayerPopup', () => {
   });
 
   it('should open popup on click element having the class given to openerCssQuery', () => {
-    $('body').append($('<button class="button1 openPopup"></button>'));
-    $('body').append($('<button class="button2 openPopup"></button>'));
+    $('body').append($('<button type="button" class="button1 openPopup"></button>'));
+    $('body').append($('<button type="button" class="button2 openPopup"></button>'));
 
     popup = new LayerPopup({
       openerCssQuery: '.openPopup'
@@ -183,8 +183,8 @@ describe('LayerPopup', () => {
   });
 
   it('should close popup on click element having the class given to closerCssQuery', () => {
-    $('body').append($('<button class="button1 closePopup"></button>'));
-    $('body').append($('<button class="button2 closePopup"></button>'));
+    $('body').append($('<button type="button" class="button1 closePopup"></button>'));
+    $('body').append($('<button type="button" class="button2 closePopup"></button>'));
 
     popup = new LayerPopup({
       closerCssQuery: '.closePopup'
@@ -232,7 +232,7 @@ describe('LayerPopup', () => {
 
   describe('remove()', () => {
     beforeEach(() => {
-      $('body').append($('<button class="button1 openPopup"></button>'));
+      $('body').append($('<button type="button" class="button1 openPopup"></button>'));
 
       popup = new LayerPopup({
         openerCssQuery: '.openPopup'
diff --git a/apps/editor/test/ui/popupAddHeading.spec.js b/apps/editor/test/ui/popupAddHeading.spec.js
index 84b4dca0c0..c1c564792c 100644
--- a/apps/editor/test/ui/popupAddHeading.spec.js
+++ b/apps/editor/test/ui/popupAddHeading.spec.js
@@ -12,7 +12,7 @@ describe('PopupAddHeading', () => {
     em;
 
   beforeEach(() => {
-    $('body').append('<button class="tui-heading"></button>');
+    $('body').append('<button type="button" class="tui-heading"></button>');
 
     em = new EventManager();