diff --git a/src/Foundation.hs b/src/Foundation.hs
index b1a1f6b97..4dfdfc166 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1387,12 +1387,8 @@ applySystemMessages = liftHandlerT . runDB . runConduit $ selectSource [] [] .|
           Nothing -> (systemMessageSummary, systemMessageContent)
           Just SystemMessageTranslation{..} -> (systemMessageTranslationSummary, systemMessageTranslationContent)
       case summary of
-        Just s -> do
-          html <- withUrlRenderer [hamlet|
-              <a href=@{MessageR cID}>
-                #{s}
-            |]
-          addMessage systemMessageSeverity html
+        Just s ->
+          addMessageWidget systemMessageSeverity $ msgModal (toWidget s) (Left . SomeRoute $ MessageR cID)
         Nothing -> addMessage systemMessageSeverity content
 
 -- Define breadcrumbs.