diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40849fa..ead52c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## Next
+- Fix buttons causing form submissions
+
 ## 2.2.3 - 2022 Nov 10
 - Improve Tailwind compatibility
 
diff --git a/src/lib/DatePicker.svelte b/src/lib/DatePicker.svelte
index 089d0c9..f230bbd 100644
--- a/src/lib/DatePicker.svelte
+++ b/src/lib/DatePicker.svelte
@@ -205,6 +205,7 @@
   <div class="tab-container" tabindex="-1">
     <div class="top">
       <button
+        type="button"
         class="page-button"
         tabindex="-1"
         on:click={() => setMonth(browseDate.getMonth() - 1)}
@@ -267,6 +268,7 @@
         >
       </div>
       <button
+        type="button"
         class="page-button"
         tabindex="-1"
         on:click={() => setMonth(browseDate.getMonth() + 1)}
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index d7bae1b..d58dbac 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -64,7 +64,7 @@
           /></svg
         >
       </a>
-      <button class="icon theme-toggle" on:click={toggleTheme}>
+      <button type="button" class="icon theme-toggle" on:click={toggleTheme}>
         <svg
           xmlns="http://www.w3.org/2000/svg"
           enable-background="new 0 0 24 24"