diff --git a/templates/changelog.html b/templates/changelog.html
index b721581714443d00b4e82d64d64b224dd2d5a0b1..ec76f038edc3d029c09f26a59bd09bdd8e1fe89f 100644
--- a/templates/changelog.html
+++ b/templates/changelog.html
@@ -15,8 +15,12 @@
 						<span class="sr-only">Previous</span>
 					</a>
 				</li>
-				{% for i in range(max(0, pagecount - 5) ,min(pagecount, pagecount + 5)) %}
-				<li class="page-item"><a class="page-link" href="{{url_for('changelog', page=i) }}">{{ i }}</a></li>
+				{% for i in range(max(0, page - 5) ,min(pagecount, page + 5)) %}
+					{% if i == page %}
+						<li class="page-item active"><a class="page-link" href="{{url_for('changelog', page=i) }}">{{ i }}</a></li>
+					{% else %}
+						<li class="page-item"><a class="page-link" href="{{url_for('changelog', page=i) }}">{{ i }}</a></li>
+					{% endif %}
 				{% endfor %}
 				<li class="page-item">
 					<a class="page-link" href="{{url_for('changelog', page=page+1) }}">
diff --git a/templates/jobs_overview.html b/templates/jobs_overview.html
index c7b7ea92957b027ac050ec2c6cf26c4c6788a954..1496e5f7fc57caa9821636f0c6b4b77b6dc79666 100644
--- a/templates/jobs_overview.html
+++ b/templates/jobs_overview.html
@@ -78,8 +78,12 @@
 								<span class="sr-only">Previous</span>
 							</a>
 						</li>
-						{% for i in range(max(0, pagecount - 5) ,min(pagecount, pagecount + 5)) %}
-						<li class="page-item"><a class="page-link" href="{{url_for('jobs_overview', page=i, **(request.args|filterdict(['page','pagesize']))) }}">{{ i }}</a></li>
+						{% for i in range(max(0, page - 5) ,min(pagecount, page + 5)) %}
+							{% if i == page %}
+								<li class="page-item active"><a class="page-link" href="{{url_for('jobs_overview', page=i, **(request.args|filterdict(['page','pagesize']))) }}">{{ i }}</a></li>
+							{% else %}
+								<li class="page-item"><a class="page-link" href="{{url_for('jobs_overview', page=i, **(request.args|filterdict(['page','pagesize']))) }}">{{ i }}</a></li>
+							{% endif %}
 						{% endfor %}
 						<li class="page-item">
 							<a class="page-link" href="{{url_for('jobs_overview', page=page+1, **(request.args|filterdict(['page','pagesize']))) }}">