diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 77c06007da4bb01b8c11a4ffa86550b2c9698d0c..b66b523ae38e2a7c5f4ce97880145ab33e51a5a5 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -50,7 +50,6 @@
 	<?php endif;?>
 	<input type="hidden" name="permissions" value="<?php echo $_['permissions']; ?>" id="permissions">
 </div>
-<div id='notification'></div>
 
 <?php if (isset($_['files']) and $_['isCreatable'] and count($_['files'])==0):?>
 	<div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div>
diff --git a/core/css/styles.css b/core/css/styles.css
index 496320561f8ab604f55a87b24fd57b58c2ccc8a1..e7ad777f719a4abee4bd5d010d7bc233af9a1ad5 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -190,7 +190,8 @@ fieldset.warning legend { color:#b94a48 !important; }
 .bold { font-weight:bold; }
 .center { text-align:center; }
 
-#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
+#notification-container { position: absolute; top: 0px; width: 100%; text-align: center; z-index: 101; line-height: 1.2;}
+#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
 #notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
 
 tr .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
diff --git a/core/js/js.js b/core/js/js.js
index 10758a9072235b38748574b7f4bc5bd2fd6f0c82..e724be9c2d55796b296d159c19c145d1cd92f228 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -311,13 +311,13 @@ OC.Notification={
         var notification = $('#notification');
         notification.hide();
         notification.html(html);
-        notification.fadeIn();
+        notification.fadeIn().css("display","inline");
     },
     show: function(text) {
         var notification = $('#notification');
         notification.hide();
         notification.text(text);
-        notification.fadeIn();
+        notification.fadeIn().css("display","inline");
     }
 };
 
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index ba5053edecf8e430e848e14fad60d49982e8be1a..be9eff80553777449e59c17e2d9c8b14c5957996 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -40,7 +40,10 @@
 	</head>
 
 	<body id="<?php echo $_['bodyid'];?>">
-		<header><div id="header">
+	<div id="notification-container">
+		<div id="notification"/>
+	</div>
+	<header><div id="header">
 			<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
 			<a class="header-right header-action" id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out');  echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
 			<form class="searchbox header-right" action="#" method="post">
diff --git a/settings/templates/users.php b/settings/templates/users.php
index e8bf9edf60408905bc215f5da84f17ac10fa8b34..80d8dc9cc86119dc7c7f163a0670dcfb055fce4f 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -73,8 +73,6 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 	</div>
 </div>
 
-<div id='notification'></div>
-
 <table data-groups="<?php echo implode(', ', $allGroups);?>">
 	<thead>
 		<tr>