diff --git a/comment/lib.php b/comment/lib.php
index 3e9ee5f8de9d0..ab154fbd8fe7f 100644
--- a/comment/lib.php
+++ b/comment/lib.php
@@ -315,6 +315,7 @@ public function output($return = true) {
 
         $strsubmit = get_string('savecomment');
         $strcancel = get_string('cancel');
+        $strshowcomments = get_string('showcommentsnonjs');
         $sesskey = sesskey();
         $html = '';
         // print html template
@@ -329,7 +330,10 @@ public function output($return = true) {
             $icon = $OUTPUT->pix_url('t/collapsed');
             $html .= <<<EOD
 <div class="mdl-left">
-<a id="comment-link-{$this->cid}" href="{$this->link}">
+<noscript>
+<a href="{$this->link}">{$strshowcomments}</a>
+</noscript>
+<a id="comment-link-{$this->cid}" class="comment-link" href="#">
     <img id="comment-img-{$this->cid}" src="$icon" alt="{$this->linktext}" title="{$this->linktext}" />
     <span id="comment-link-text-{$this->cid}">{$this->linktext} {$this->count}</span>
 </a>
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index ab19fa6bebc67..e67234ee59eb4 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -1480,6 +1480,7 @@
 $string['showallweeks'] = 'Show all weeks';
 $string['showblockcourse'] = 'Show list of courses containing block';
 $string['showcomments'] = 'Show/hide comments';
+$string['showcommentsnonjs'] = 'Show comments';
 $string['showgrades'] = 'Show gradebook to students';
 $string['showgrades_help'] = 'Many activities in the course allow grades to be set. This setting determines whether a student can view a list of all their grades for the course via a grades link in the course administration block.';
 $string['showlistofcourses'] = 'Show list of courses';
diff --git a/theme/base/style/core.css b/theme/base/style/core.css
index 44ef985cb5645..c1550975e5d54 100644
--- a/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@ -332,6 +332,8 @@ table.mod_index {width:100%;}
 .comment-delete-confirm {background: #eee; padding: 2px; width: 5em;text-align:center;}
 .comment-container {float:left;margin: 4px;}
 .comment-report-selectall{display:none}
+.comment-link {display:none}
+.jsenabled .comment-link {display:block}
 .jsenabled .comment-report-selectall{display:inline}
 
 /**