diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 66d5dd60a2d..6476bc4d91a 100644
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -288,7 +288,14 @@
 
     if ($allentries) {
 
-        $paging = glossary_get_paging_bar($count, $page, $entriesbypage, "view.php?id=$id&mode=$mode&hook=$hook&sortkey=$sortkey&sortorder=$sortorder&fullsearch=$fullsearch&",9999,10,'  ', get_string("allentries","glossary"), -1);
+        //Decide if we must show the ALL link in the pagebar
+        $specialtext = '';
+        if ($glossary->showall) {
+            $specialtext = get_string("allentries","glossary");
+        }
+
+        //Build paging bar
+        $paging = glossary_get_paging_bar($count, $page, $entriesbypage, "view.php?id=$id&mode=$mode&hook=$hook&sortkey=$sortkey&sortorder=$sortorder&fullsearch=$fullsearch&",9999,10,'  ', $specialtext, -1);
 
         echo '<div class="paging">';
         echo $paging;