diff --git a/rhodecode/templates/admin/notifications/notifications.html b/rhodecode/templates/admin/notifications/notifications.html
--- a/rhodecode/templates/admin/notifications/notifications.html
+++ b/rhodecode/templates/admin/notifications/notifications.html
@@ -24,22 +24,30 @@
             </li>          
         </ul>            
     </div>
+    %if c.notifications:
       <div style="padding:10px 15px;text-align: right">
       <span id='mark_all_read' class="ui-btn">${_('Mark all read')}</span>
-  </div>
+      </div>
+    %endif
   <div id='notification_data'>
     <%include file='notifications_data.html'/>
   </div>
 </div>
 <script type="text/javascript">
-var url = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
+var url_del = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
 YUE.on(YUQ('.delete-notification'),'click',function(e){
  var notification_id = e.currentTarget.id;
- deleteNotification(url,notification_id)
+ deleteNotification(url_del,notification_id)
 })
  YUE.on('mark_all_read','click',function(e){
 	    var url = "${h.url('notifications_mark_all_read')}";
-	    ypjax(url,'notification_data',function(){YUD.get('notification_counter').innerHTML=0});
+	    ypjax(url,'notification_data',function(){
+	    	YUD.get('notification_counter').innerHTML=0;
+	    	YUE.on(YUQ('.delete-notification'),'click',function(e){
+	    		 var notification_id = e.currentTarget.id;
+	    		 deleteNotification(url_del,notification_id)
+	    	})	    	
+	    });
  })
 </script>
 </%def>  
diff --git a/rhodecode/templates/admin/notifications/notifications_data.html b/rhodecode/templates/admin/notifications/notifications_data.html
--- a/rhodecode/templates/admin/notifications/notifications_data.html
+++ b/rhodecode/templates/admin/notifications/notifications_data.html
@@ -1,5 +1,5 @@
 
-% if c.notifications:
+%if c.notifications:
 <%
 unread = lambda n:{False:'unread'}.get(n)
 %>