diff --git a/theme/boost/templates/core/paging_bar.mustache b/theme/boost/templates/core/paging_bar.mustache
index 29801aa522c..5dedc9806e4 100644
--- a/theme/boost/templates/core/paging_bar.mustache
+++ b/theme/boost/templates/core/paging_bar.mustache
@@ -1,6 +1,6 @@
 {{#haspages}}
     <nav aria-label="{{label}}">
-        <ul class="pagination">
+        <ul class="pagination mt-3">
             {{#previous}}
                 <li class="page-item">
                     <a href="{{url}}" class="page-link">
@@ -19,7 +19,7 @@
             {{/first}}
             {{#pages}}
                 <li class="page-item {{#active}}active{{/active}}">
-                    <a href="{{url}}" class="page-link">
+                    <a href="{{#url}}{{.}}{{/url}}{{^url}}#{{/url}}" class="page-link">
                         {{page}}
                         {{#active}}
                             <span class="sr-only">{{#str}}currentinparentheses, theme_boost{{/str}}</span>