diff --git a/src/Foundation.hs b/src/Foundation.hs
index 0bb653360..eb0816fd6 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -961,6 +961,8 @@ siteLayout headingOverride widget = do
       asidenav = $(widgetFile "widgets/asidenav")
       footer :: Widget
       footer = $(widgetFile "widgets/footer")
+      alerts :: Widget
+      alerts = $(widgetFile "widgets/alerts/alerts")
       contentHeadline :: Maybe Widget
       contentHeadline = (toWidget <$> headingOverride) <|> (pageHeading =<< mcurrentRoute)
       breadcrumbsWgt :: Widget
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index c01ab4e45..87870650b 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -30,16 +30,7 @@ $if not isModal
       ^{widget}
 
       <!-- alerts -->
-      <!-- ^{alerts mmsgs} -->
-      <div #alerts .alerts>
-        <div .alerts__toggler>
-        $forall (status, msg) <- mmsgs
-          $with status2 <- bool status "info" (status == "")
-            <div class="alert alert-#{status2}">
-              <div .alert__closer>
-              <div .alert__icon>
-              <div .alert__content>
-                #{msg}
+      ^{alerts}
 
     <!-- footer -->
     $if not isModal