diff --git a/src/components/Drawer/index.tsx b/src/components/Drawer/index.tsx
index f04d360..b136fea 100644
--- a/src/components/Drawer/index.tsx
+++ b/src/components/Drawer/index.tsx
@@ -204,12 +204,12 @@ export const Drawer: React.FC<PropsWithChildren<DrawerProps>> = ({
       <div className={classnames('flex items-center', { 'justify-between': onBack, 'justify-end': !onBack })}>
         {/* If there's the back button, display it */}
         {onBack && (
-          <button className="pui-btn-icon text-pui-paragraph-900 p-4" onClick={onBack}>
+          <button type="button" className="pui-btn-icon text-pui-paragraph-900 p-4" onClick={onBack}>
             {/* Adds a back icon */}
             <BackIcon className="pui-animate-scaleHover-target" />
           </button>
         )}
-        <button className="pui-btn-icon text-pui-paragraph-900 p-4" onClick={() => onOpen(false)}>
+        <button type="button" className="pui-btn-icon text-pui-paragraph-900 p-4" onClick={() => onOpen(false)}>
           {/* Adds a close icon */}
           <CrossIcon className="pui-animate-scaleHover-target" />
         </button>
diff --git a/src/components/EventCard/index.tsx b/src/components/EventCard/index.tsx
index 56ef2e2..89b9a5a 100644
--- a/src/components/EventCard/index.tsx
+++ b/src/components/EventCard/index.tsx
@@ -135,6 +135,7 @@ export const EventCard: React.FC<EventCardProps> = ({
             />
           </div>
           <button
+            type="button"
             onClick={onPressButton}
             className="inline-flex items-center pui-chip-bordered h-8 justify-items-end cursor-pointer font-bold focus:outline-none"
           >
diff --git a/src/components/HorizontalResizeablePanel/index.tsx b/src/components/HorizontalResizeablePanel/index.tsx
index b34d4c8..e6bdbab 100644
--- a/src/components/HorizontalResizeablePanel/index.tsx
+++ b/src/components/HorizontalResizeablePanel/index.tsx
@@ -147,6 +147,7 @@ export const HorizontalResizeablePanel: React.FC<HorizontalResizeablePanelProps>
     <div {...props} className={classNames('relative', props.className)} ref={ref}>
       {resizeLeft && (
         <button
+          type="button"
           className="absolute h-full inset-y-0 w-2 cursor-col-resize"
           style={{ left: '-4px' }}
           onMouseDown={(e) => onMove(e, 'left')}
@@ -154,6 +155,7 @@ export const HorizontalResizeablePanel: React.FC<HorizontalResizeablePanelProps>
       )}
       {resizeRight && (
         <button
+          type="button"
           className="absolute h-full inset-y-0 w-2 cursor-col-resize"
           style={{ right: '-4px' }}
           onMouseDown={(e) => onMove(e, 'right')}
diff --git a/src/components/Modal/index.tsx b/src/components/Modal/index.tsx
index 7f70d11..8cc59af 100644
--- a/src/components/Modal/index.tsx
+++ b/src/components/Modal/index.tsx
@@ -116,7 +116,7 @@ export const Modal: React.FC<PropsWithChildren<ModalProps>> = ({
             <h3 className={classnames(removePadding ? 'p-0' : 'p-4')}>{title}</h3>
             {/* Adds a close icon */}
             {isClosable && (
-              <button className="pui-btn-icon text-pui-paragraph-900 px-6 py-4" onClick={onToggle}>
+              <button type="button" className="pui-btn-icon text-pui-paragraph-900 px-6 py-4" onClick={onToggle}>
                 <CrossIcon className="pui-animate-scaleHover-target" />
               </button>
             )}
diff --git a/src/components/ModuleCard/index.tsx b/src/components/ModuleCard/index.tsx
index 16b061b..52dfa3f 100644
--- a/src/components/ModuleCard/index.tsx
+++ b/src/components/ModuleCard/index.tsx
@@ -114,6 +114,7 @@ export const ModuleCard: React.FC<ModuleCardProps> = ({
         <div className={classnames('text-base mb-6 font-normal', classNameContent)}>{content}</div>
         <div className="flex-1 inline-flex justify-end items-end w-full">
           <button
+            type="button"
             onClick={onPressButton}
             className="inline-flex items-center pui-chip-bordered h-8 justify-items-end cursor-pointer font-bold focus:outline-none"
           >
diff --git a/src/components/ProgramCard/index.tsx b/src/components/ProgramCard/index.tsx
index 361e8ff..7f511b2 100644
--- a/src/components/ProgramCard/index.tsx
+++ b/src/components/ProgramCard/index.tsx
@@ -116,6 +116,7 @@ export const ProgramCard: React.FC<ProgramCardProps> = ({
         </div>
         <div className="inline-flex justify-end items-center w-full">
           <button
+            type="button"
             onClick={onPressButton}
             className="inline-flex items-center pui-chip-bordered h-8 justify-items-end cursor-pointer font-bold focus:outline-none"
           >
diff --git a/src/components/WYSIWYGInput/Toolbar/Section/Item/index.tsx b/src/components/WYSIWYGInput/Toolbar/Section/Item/index.tsx
index 01524a3..bab8aec 100644
--- a/src/components/WYSIWYGInput/Toolbar/Section/Item/index.tsx
+++ b/src/components/WYSIWYGInput/Toolbar/Section/Item/index.tsx
@@ -66,6 +66,7 @@ export const SectionItems: React.FC<SectionItemsProps> = ({
             const isActive = item.isActive(editorState);
             return (
               <button
+                type="button"
                 key={item.name}
                 className={classnames(
                   'pui-btn-icon p-0 h-8 w-8 flex items-center justify-center border border-gray-200',