diff --git a/apps/common/templatetags/common_tags.py b/apps/common/templatetags/common_tags.py
index 01d1ab8f3..6919e1228 100644
--- a/apps/common/templatetags/common_tags.py
+++ b/apps/common/templatetags/common_tags.py
@@ -30,8 +30,13 @@ def pagination_range(total_page, current_num=1, display=5):
     except ValueError:
         current_num = 1
 
-    start = current_num - display/2 if current_num > display/2 else 1
-    end = start + display if start + display <= total_page else total_page + 1
+    half_display = int(display/2)
+    start = current_num - half_display if current_num > half_display else 1
+    if start + display <= total_page:
+        end = start + display
+    else:
+        end = total_page + 1
+        start = end - display if end > display else 1
 
     return range(start, end)
 
@@ -68,4 +73,4 @@ def to_html(s):
 
 @register.filter
 def proxy_log_commands(log_id):
-    return command_store.filter(proxy_log_id=log_id)
\ No newline at end of file
+    return command_store.filter(proxy_log_id=log_id)