diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index cdcffaad5..22fe5fa2d 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -11,7 +11,7 @@ $if not isModal
 
 <div .main>
 
-  <div .main__content uw-poc>
+  <div .main__content uw-poc :isJust currentHandler:uw-handler=#{fromMaybe "" currentHandler}>
 
     $if not isModal
       <!-- breadcrumbs -->