diff --git a/services/web/app/views/layout.pug b/services/web/app/views/layout.pug
index 87a42c3f45..5b0694c40c 100644
--- a/services/web/app/views/layout.pug
+++ b/services/web/app/views/layout.pug
@@ -112,18 +112,6 @@ html(itemscope, itemtype='http://schema.org/Product')
 			)
 
 		- if(typeof(suppressSystemMessages) == "undefined")
-			.system-messages(
-				ng-cloak
-				ng-controller="SystemMessagesController"
-			)
-				.system-message(
-					ng-repeat="message in messages"
-					ng-controller="SystemMessageController"
-					ng-hide="hidden"
-				)
-					a(href, ng-click="hide()").pull-right ×
-					.system-message-content(ng-bind-html="htmlContent")
-	
 			include translations/translation_message
 
 
diff --git a/services/web/app/views/project/list.pug b/services/web/app/views/project/list.pug
index 2728cb87d5..bc7da60d73 100644
--- a/services/web/app/views/project/list.pug
+++ b/services/web/app/views/project/list.pug
@@ -57,8 +57,19 @@ block content
 							ng-click="showAll();"
 						) Show all
 	.content.content-alt.project-list-page(ng-controller="ProjectPageController")
+		- if(typeof(suppressSystemMessages) == "undefined")
+			.system-messages(
+				ng-cloak
+				ng-controller="SystemMessagesController"
+			)
+				.system-message(
+					ng-repeat="message in messages"
+					ng-controller="SystemMessageController"
+					ng-hide="hidden"
+				)
+					a(href, ng-click="hide()").pull-right ×
+					.system-message-content(ng-bind-html="htmlContent")
 		.project-list-content
-
 			.row.project-list-row(ng-cloak)
 				.project-list-container(ng-if="projects.length > 0")
 					.project-list-sidebar-wrapper.col-md-2.col-xs-3