diff --git a/notification/templates/notification/_notification_menu.html b/notification/templates/notification/_notification_menu.html
index fd1009e6d..40f34e09d 100644
--- a/notification/templates/notification/_notification_menu.html
+++ b/notification/templates/notification/_notification_menu.html
@@ -8,7 +8,7 @@
   <ul class="dropdown-menu">
     {% for entry in notifications %}
     <li>
-      <a href="{{ entry.link }}" class="alert-link">
+      <a href="{{ entry.link }}" class="page-modal">
         {{ entry.name }}
       </a>
     </li>
diff --git a/notification/templates/notification/_notification_messages.html b/notification/templates/notification/_notification_messages.html
index 483ea5827..1241da876 100644
--- a/notification/templates/notification/_notification_messages.html
+++ b/notification/templates/notification/_notification_messages.html
@@ -6,7 +6,7 @@
         {% trans "You have" %} {{ count }} {{ unread_message }}
         <ul>
             {% for entry in notifications %}
-            <li><a href="{{ entry.link }}" class="alert-link">
+            <li><a href="{{ entry.link }}" class="page-modal">
                 {{ entry.name }}
             </a></li>
             {% endfor %}
diff --git a/notification/views.py b/notification/views.py
index 47f7564c0..9eee79c89 100644
--- a/notification/views.py
+++ b/notification/views.py
@@ -24,7 +24,7 @@ def get(self, request, *args, **kwargs):
         self.notification.save()
         if self.notification.submission:
             return self.redirect(
-                self.notification.submission.exercise.get_display_url()
+                self.notification.submission.get_url('submission-plain')
             )
         return HttpResponse(
             "[Old Notification] {}: {}".format(