diff --git a/templates/pages/edit_bag.html b/templates/pages/edit_bag.html
index b9a1aed..c2c1fe0 100644
--- a/templates/pages/edit_bag.html
+++ b/templates/pages/edit_bag.html
@@ -11,7 +11,7 @@
 
   <section class="rounded-lg border bg-surface p-5">
     <form
-      class="flex flex-col gap-4"
+      class="flex flex-col gap-4 pb-16 md:pb-0"
       data-signals:_submitting="false"
       data-signals:_submit-error="''"
       data-signals:_roast-date="'{{ roast_date }}'"
diff --git a/templates/pages/edit_brew.html b/templates/pages/edit_brew.html
index 8faea3d..701525b 100644
--- a/templates/pages/edit_brew.html
+++ b/templates/pages/edit_brew.html
@@ -12,7 +12,7 @@
 
   <section class="rounded-lg border bg-surface p-5">
     <form
-      class="flex flex-col gap-6"
+      class="flex flex-col gap-6 pb-16 md:pb-0"
       data-signals:_submitting="false"
       data-signals:_submit-error="''"
       data-signals:_coffee-weight="{{ coffee_weight }}"
diff --git a/templates/pages/edit_cafe.html b/templates/pages/edit_cafe.html
index 798ece2..fae198e 100644
--- a/templates/pages/edit_cafe.html
+++ b/templates/pages/edit_cafe.html
@@ -12,7 +12,7 @@
 
   <section class="rounded-lg border bg-surface p-5">
     <form
-      class="flex flex-col gap-4"
+      class="flex flex-col gap-4 pb-16 md:pb-0"
       data-signals:_submitting="false"
       data-signals:_submit-error="''"
       data-signals:_name="'{{ name }}'"
diff --git a/templates/pages/edit_cup.html b/templates/pages/edit_cup.html
index 9206464..aa12cda 100644
--- a/templates/pages/edit_cup.html
+++ b/templates/pages/edit_cup.html
@@ -12,7 +12,7 @@
 
   <section class="rounded-lg border bg-surface p-5">
     <form
-      class="flex flex-col gap-4"
+      class="flex flex-col gap-4 pb-16 md:pb-0"
       data-signals:_submitting="false"
       data-signals:_submit-error="''"
       data-on:submit="$_submitting = true; $_submitError = ''; @put('/api/v1/cups/{{ id }}', {contentType: 'form'})"
diff --git a/templates/pages/edit_gear.html b/templates/pages/edit_gear.html
index 8679740..fff7812 100644
--- a/templates/pages/edit_gear.html
+++ b/templates/pages/edit_gear.html
@@ -12,7 +12,7 @@
 
   <section class="rounded-lg border bg-surface p-5">
     <form
-      class="flex flex-col gap-4"
+      class="flex flex-col gap-4 pb-16 md:pb-0"
       data-signals:_submitting="false"
       data-signals:_submit-error="''"
       data-signals:_make="'{{ make }}'"
diff --git a/templates/pages/edit_roast.html b/templates/pages/edit_roast.html
index 9611b27..b35e7ea 100644
--- a/templates/pages/edit_roast.html
+++ b/templates/pages/edit_roast.html
@@ -12,7 +12,7 @@
 
   <section class="rounded-lg border bg-surface p-5">
     <form
-      class="flex flex-col gap-4"
+      class="flex flex-col gap-4 pb-16 md:pb-0"
       data-signals:_submitting="false"
       data-signals:_submit-error="''"
       data-signals:_name="'{{ name }}'"
diff --git a/templates/pages/edit_roaster.html b/templates/pages/edit_roaster.html
index bb0c128..ad63c1b 100644
--- a/templates/pages/edit_roaster.html
+++ b/templates/pages/edit_roaster.html
@@ -12,7 +12,7 @@
 
   <section class="rounded-lg border bg-surface p-5">
     <form
-      class="flex flex-col gap-4"
+      class="flex flex-col gap-4 pb-16 md:pb-0"
       data-signals:_submitting="false"
       data-signals:_submit-error="''"
       data-signals:_name="'{{ name }}'"
diff --git a/templates/partials/detail_cards.html b/templates/partials/detail_cards.html
index 3419c3d..dcca1ba 100644
--- a/templates/partials/detail_cards.html
+++ b/templates/partials/detail_cards.html
@@ -161,7 +161,7 @@
   >
     {{ icons::spinner("h-5 w-5") }} Saving&hellip;
   </div>
-  <div class="flex flex-col gap-2" data-show="!$_submitting">
+  <div class="sticky-submit flex flex-col gap-2" data-show="!$_submitting">
     <button
       type="submit"
       class="inline-flex w-full items-center justify-center gap-2 rounded-md bg-accent px-4 py-2 text-sm font-semibold text-accent-text transition hover:bg-accent-hover disabled:opacity-50"