diff --git a/mod/assign/classes/output/grading_app.php b/mod/assign/classes/output/grading_app.php
index aa2f65984ac..c26f8701085 100644
--- a/mod/assign/classes/output/grading_app.php
+++ b/mod/assign/classes/output/grading_app.php
@@ -121,6 +121,9 @@ class grading_app implements templatable, renderable {
             }
         }
 
+        $export->actiongrading = 'grading';
+        $export->viewgrading = get_string('viewgrading', 'mod_assign');
+
         $export->showreview = $showreview;
 
         $time = time();
diff --git a/mod/assign/templates/grading_navigation.mustache b/mod/assign/templates/grading_navigation.mustache
index 62e5d996fae..9a6927a8608 100644
--- a/mod/assign/templates/grading_navigation.mustache
+++ b/mod/assign/templates/grading_navigation.mustache
@@ -46,13 +46,21 @@
 <a href="{{config.wwwroot}}/course/view.php?id={{courseid}}" title="{{{coursename}}}">{{{coursename}}}</a><br/>
 
 {{!
-    Row 2) Assignment name & link.
+    Row 2) Assignment name & link, & edit settings.
 }}
 <a href="{{config.wwwroot}}/mod/assign/view.php?id={{cmid}}" title="{{name}}">{{name}}</a>
 
+{{#caneditsettings}}
+<a href="{{config.wwwroot}}/course/modedit.php?update={{cmid}}&return=1">{{#pix}}t/edit, core,{{#str}}editsettings{{/str}}{{/pix}}</a>
+{{/caneditsettings}}
+
+<br/>
+
 {{!
-    Row 3) Edit settings, due date, with tool-tip thing.
+    Row 3) Assignment grading & link, due date, with tool-tip thing.
 }}
+<a href="{{config.wwwroot}}/mod/assign/view.php?id={{cmid}}&action={{actiongrading}}" title="{{viewgrading}}">{{viewgrading}}</a>
+
 <div role="tooltip" id="tooltip-{{uniqid}}" class="accesshide">
 {{#duedate}}
 {{#str}}duedatecolon, mod_assign, {{duedatestr}}{{/str}}
@@ -67,10 +75,6 @@
 {{/duedate}}
 </div>
 
-<br/>
-{{#caneditsettings}}
-<a href="{{config.wwwroot}}/course/modedit.php?update={{cmid}}&return=1">{{#pix}}t/edit, core,{{#str}}editsettings{{/str}}{{/pix}}</a>
-{{/caneditsettings}}
 </span>
 </div>
 
diff --git a/theme/boost/templates/mod_assign/grading_navigation.mustache b/theme/boost/templates/mod_assign/grading_navigation.mustache
index c6809b337c4..ab2d9e56005 100644
--- a/theme/boost/templates/mod_assign/grading_navigation.mustache
+++ b/theme/boost/templates/mod_assign/grading_navigation.mustache
@@ -46,13 +46,21 @@
 <a href="{{config.wwwroot}}/course/view.php?id={{courseid}}" title="{{{coursename}}}">{{{coursename}}}</a><br/>
 
 {{!
-    Row 2) Assignment name & link.
+    Row 2) Assignment name & link, & edit settings.
 }}
 <a href="{{config.wwwroot}}/mod/assign/view.php?id={{cmid}}" title="{{name}}">{{name}}</a>
 
+{{#caneditsettings}}
+<a href="{{config.wwwroot}}/course/modedit.php?update={{cmid}}&return=1">{{#pix}}t/edit, core,{{#str}}editsettings{{/str}}{{/pix}}</a>
+{{/caneditsettings}}
+
+<br/>
+
 {{!
-    Row 3) Edit settings, due date, with tool-tip thing.
+    Row 3) Assignment grading & link, due date, with tool-tip thing.
 }}
+<a href="{{config.wwwroot}}/mod/assign/view.php?id={{cmid}}&action={{actiongrading}}" title="{{viewgrading}}">{{viewgrading}}</a>
+
 <div role="tooltip" id="tooltip-{{uniqid}}" class="accesshide">
 {{#duedate}}
 {{#str}}duedatecolon, mod_assign, {{duedatestr}}{{/str}}
@@ -67,10 +75,6 @@
 {{/duedate}}
 </div>
 
-<br/>
-{{#caneditsettings}}
-<a href="{{config.wwwroot}}/course/modedit.php?update={{cmid}}&return=1">{{#pix}}t/edit, core,{{#str}}editsettings{{/str}}{{/pix}}</a>
-{{/caneditsettings}}
 </span>
 </div>