diff --git a/lostplaces/lostplaces_app/templates/partials/nav/pagination.html b/lostplaces/lostplaces_app/templates/partials/nav/pagination.html
index b65b00f..8f2efc0 100644
--- a/lostplaces/lostplaces_app/templates/partials/nav/pagination.html
+++ b/lostplaces/lostplaces_app/templates/partials/nav/pagination.html
@@ -1,25 +1,31 @@
-<div class="LP-Pagination">
-    <ul class="LP-Pagination__List">
-        {% if page_obj.has_previous %}
-            <li class="LP-Pagination__Item LP-Pagination__Item--first">
-                <a href="?page=1" class="LP-Link"><span class="LP-Pagination__First">first</span></a>
-            </li>
-            <li class="LP-Pagination__Item LP-Pagination__Item--previous">
-                <a href="?page={{ page_obj.previous_page_number }}" class="LP-Link"><span class="LP-Pagination__Previous">previous</span></a>
-            </li>
-        {% endif %}
-        {% for page_obj in page_obj.paginator %}
-            <li class="LP-Pagination__Item LP-Pagination__Item--number">
-                <a href="?page={{page_obj.number}}" class="LP-Link"><span class="LP-Pagination__Number">{{page_obj.number}}</span></a>
-            </li>
-        {% endfor %}
-        {% if page_obj.has_next %}
-            <li class="LP-Pagination__Item LP-Pagination__Item--next">
-                <a href="?page={{ page_obj.next_page_number }}" class="LP-Link"><span class="LP-Pagination__Next">next</span></a>
-            </li>
-            <li class="LP-Pagination__Item LP-Pagination__Item--last">
-                <a href="?page={{ page_obj.paginator.num_pages }}" class="LP-Link"><span class="LP-Pagination__Last">last</span></a>
-            </li>
-        {% endif %}
-    </ul>
-</div>
\ No newline at end of file
+{% if is_paginated %}
+    <div class="LP-Pagination">
+        <ul class="LP-Pagination__List">
+            {% if page_obj.has_previous %}
+                <li class="LP-Pagination__Item LP-Pagination__Item--first">
+                    <a href="?page=1" class="LP-Link"><span class="LP-Pagination__First">first</span></a>
+                </li>
+                <li class="LP-Pagination__Item LP-Pagination__Item--previous">
+                    <a href="?page={{ page_obj.previous_page_number }}" class="LP-Link"><span class="LP-Pagination__Previous">previous</span></a>
+                </li>
+            {% endif %}
+            {% for i in page_obj.paginator %}
+                {% if i.number == page_obj.number %}
+                    <li class="LP-Pagination__Item LP-Pagination__Item--number LP-Pagination__Item--current">
+                {% else %}
+                    <li class="LP-Pagination__Item LP-Pagination__Item--number">
+                {% endif %}
+                        <a href="?page={{i.number}}" class="LP-Link"><span class="LP-Pagination__Number">{{i.number}}</span></a>
+                    </li>
+            {% endfor %}
+            {% if page_obj.has_next %}
+                <li class="LP-Pagination__Item LP-Pagination__Item--next">
+                    <a href="?page={{ page_obj.next_page_number }}" class="LP-Link"><span class="LP-Pagination__Next">next</span></a>
+                </li>
+                <li class="LP-Pagination__Item LP-Pagination__Item--last">
+                    <a href="?page={{ page_obj.paginator.num_pages }}" class="LP-Link"><span class="LP-Pagination__Last">last</span></a>
+                </li>
+            {% endif %}
+        </ul>
+    </div>
+{% endif %}