diff --git a/src/Ui/media/Notifications.coffee b/src/Ui/media/Notifications.coffee
index b31067fb..7264bb2d 100644
--- a/src/Ui/media/Notifications.coffee
+++ b/src/Ui/media/Notifications.coffee
@@ -51,7 +51,7 @@ class Notifications
 			), timeout
 
 		# Animate
-		width = elem.outerWidth()
+		width = Math.min(elem.outerWidth(), 580)
 		if not timeout then width += 20 # Add space for close button
 		if elem.outerHeight() > 55 then elem.addClass("long")
 		elem.css({"width": "50px", "transform": "scale(0.01)"})
diff --git a/src/Ui/media/Wrapper.css b/src/Ui/media/Wrapper.css
index b78427d6..ff613e87 100644
--- a/src/Ui/media/Wrapper.css
+++ b/src/Ui/media/Wrapper.css
@@ -58,7 +58,7 @@ a { color: black }
 .notification .message-outer { display: table-row }
 .notification .buttons { display: table-cell; vertical-align: top; padding-top: 9px; }
 .notification.long .body { padding-top: 10px; padding-bottom: 10px }
-.notification .message { display: table-cell; vertical-align: middle; }
+.notification .message { display: table-cell; vertical-align: middle; max-width: 400px; white-space: normal; }
 
 .notification.visible { max-width: 350px }