diff --git a/blocks/CloudImageEditor/src/EditorButtonControl.js b/blocks/CloudImageEditor/src/EditorButtonControl.js
index 3dd6b66c..4cca4f73 100644
--- a/blocks/CloudImageEditor/src/EditorButtonControl.js
+++ b/blocks/CloudImageEditor/src/EditorButtonControl.js
@@ -37,7 +37,7 @@ export class EditorButtonControl extends Block {
 }
 
 EditorButtonControl.template = /* HTML */ `
-  <button role="option">
+  <button type="button" role="option">
     <lr-icon set="@name: icon;"></lr-icon>
     <div class="title" ref="title-el">{{title}}</div>
   </button>
diff --git a/blocks/CloudImageEditor/src/EditorFilterControl.js b/blocks/CloudImageEditor/src/EditorFilterControl.js
index 2a8e92e9..b6f7fcab 100644
--- a/blocks/CloudImageEditor/src/EditorFilterControl.js
+++ b/blocks/CloudImageEditor/src/EditorFilterControl.js
@@ -148,7 +148,7 @@ export class EditorFilterControl extends EditorButtonControl {
 }
 
 EditorFilterControl.template = /* HTML */ `
-  <button role="option">
+  <button type="button" role="option">
     <div class="preview" ref="preview-el"></div>
     <lr-icon ref="icon-el" set="@name: icon; @size: iconSize;"></lr-icon>
   </button>
diff --git a/blocks/CloudImageEditor/src/elements/button/LrBtnUi.js b/blocks/CloudImageEditor/src/elements/button/LrBtnUi.js
index 97103631..a6cfdfbb 100644
--- a/blocks/CloudImageEditor/src/elements/button/LrBtnUi.js
+++ b/blocks/CloudImageEditor/src/elements/button/LrBtnUi.js
@@ -83,7 +83,7 @@ export class LrBtnUi extends Block {
 LrBtnUi.bindAttributes({ text: 'text', icon: 'icon', reverse: 'reverse', theme: 'theme' });
 
 LrBtnUi.template = /* HTML */ `
-  <button set="@role:aria-role; @aria-controls: aria-controls">
+  <button type="button" set="@role:aria-role; @aria-controls: aria-controls">
     <lr-icon set="className: iconCss; @name: icon; @hidden: !icon"></lr-icon>
     <div class="text">{{text}}</div>
   </button>
diff --git a/blocks/SourceBtn/SourceBtn.js b/blocks/SourceBtn/SourceBtn.js
index eb0fad35..cf15cee6 100644
--- a/blocks/SourceBtn/SourceBtn.js
+++ b/blocks/SourceBtn/SourceBtn.js
@@ -134,7 +134,7 @@ export class SourceBtn extends UploaderBlock {
 }
 
 SourceBtn.template = /* HTML */ `
-  <button>
+  <button type="button">
     <lr-icon set="@name: iconName"></lr-icon>
     <div class="txt" l10n="src-type"></div>
   </button>