diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index b761945cd..d4ad1e684 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -1,4 +1,4 @@
-%nav.navbar.navbar-expand-lg.navbar-dark.bg-dark.justify-content-between
+%nav.navbar.navbar-expand-lg.navbar-dark.bg-dark.justify-content-between.sticky-top
   .nav
     %a.navbar-brand{ href: root_path }
       = image_tag("pear.png", class: 'logo', alt: 'Growstuff brand logo (drawing of a pear)')
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 311a712f7..82c86823e 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -2,7 +2,7 @@
 %html{ lang: "en", prefix: "og: https://ogp.me/ns#" }
   = yield :scripts
   = render "layouts/head"
-  %body
+  %body.d-flex.flex-column.vh-100
     = query_diet_widget if Rails.env.development?
     .sr-only= link_to t(".skip"), "#skipnav"
     = render "layouts/header"
@@ -25,7 +25,7 @@
         = render "shared/flash_messages", flash: flash
         %main= yield
 
-    %footer.page-footer.font-small.bg-dark.pt-4= render "layouts/footer"
+    %footer.page-footer.font-small.bg-dark.pt-4.mt-auto= render "layouts/footer"
     /
       Javascripts
       \==================================================