diff --git a/handler/template.go b/handler/template.go
index c90c498..6b8dd5f 100644
--- a/handler/template.go
+++ b/handler/template.go
@@ -133,11 +133,12 @@ func CreatePaginator(base, ending string, current_page, max_page int) template.H
 		count++
 	}
 
-	pages += fmt.Sprintf(`<a href="%s%d%s" class="pagination-button">&rsaquo;</a>`, base, min(max_page, current_page+1), ending)
 
 	if max_page == -1 {
+		pages += fmt.Sprintf(`<a href="%s%d%s" class="pagination-button">&rsaquo;</a>`, base, current_page+1, ending)
 		pages += fmt.Sprintf(`<a href="%s%d%s" class="pagination-button" id="disabled">&raquo;</a>`, base, max_page, ending)
 	} else {
+		pages += fmt.Sprintf(`<a href="%s%d%s" class="pagination-button">&rsaquo;</a>`, base, min(max_page, current_page+1), ending)
 		pages += fmt.Sprintf(`<a href="%s%d%s" class="pagination-button">&raquo;</a>`, base, max_page, ending)
 	}