diff --git a/lib/Pooru/Site.pm b/lib/Pooru/Site.pm
index 6639286..c8ada93 100644
--- a/lib/Pooru/Site.pm
+++ b/lib/Pooru/Site.pm
@@ -3,23 +3,43 @@ use Mojo::Base "Mojolicious", -signatures;
 
 use Pooru::Storage::Static;
 
+use constant {
+	EXTENDED_PAGER_LENGTH => 7,
+};
+
 sub extended_pager ($self, $pager)
 {
-	my ($start, $end);
+	my (%pages, $start, $end, $mid);
 
-	if ($pager->{current_page} < $pager->{first_page} + 2) {
+	$mid = int(EXTENDED_PAGER_LENGTH / 2);
+	if ($pager->{current_page} < $pager->{first_page} + $mid) {
 		$start = $pager->{first_page};
-		$end = $start + 4;
-	} elsif ($pager->{current_page} > $pager->{last_page} - 2) {
+		$end = $start + $mid * 2;
+	} elsif ($pager->{current_page} > $pager->{last_page} - $mid) {
 		$end = $pager->{last_page};
-		$start = $end - 4;
+		$start = $end - $mid * 2;
 	} else {
-		$start = $pager->{current_page} - 2;
-		$end = $pager->{current_page} + 2;
+		$start = $pager->{current_page} - $mid;
+		$end = $pager->{current_page} + $mid;
 	}
+	$pages{pages} = [grep {$_ >= $pager->{first_page} &&
+	    $_ <= $pager->{last_page}} ($start .. $end)];
 
-	return grep {$_ >= $pager->{first_page} && $_ <= $pager->{last_page}}
-	    ($start .. $end);
+	$pages{shortcuts}{first_page} = $pager->{first_page} if
+	    $pager->{first_page} != $pager->{current_page};
+	$pages{shortcuts}{previous_page} = $pager->{previous_page} if
+	    defined($pager->{previous_page});
+	$pages{shortcuts}{next_page} = $pager->{next_page} if
+	    defined($pager->{next_page});
+	$pages{shortcuts}{last_page} = $pager->{last_page} if
+	    $pager->{last_page} != $pager->{current_page};
+
+	return %pages;
+}
+
+sub tag_for_pager_shortcut ($self, $content, $page) {
+	return (defined($page) and $self->link_to($content,
+	    $self->url_with->query({page => $page})));
 }
 
 sub link_for_tag ($self, $tag)
@@ -68,6 +88,7 @@ sub startup ($self)
 		return Mojo::URL->new($self->config("pooru_api")->{v0});
 	});
 	$self->helper(extended_pager => \&extended_pager);
+	$self->helper(tag_for_pager_shortcut => \&tag_for_pager_shortcut);
 	$self->helper(link_for_tag => \&link_for_tag);
 	$self->helper(tags_by_kind => \&tags_by_kind);
 
diff --git a/templates/_pager.html.ep b/templates/_pager.html.ep
index 543a540..2d22bfb 100644
--- a/templates/_pager.html.ep
+++ b/templates/_pager.html.ep
@@ -1,24 +1,18 @@
 % if (my $pager = stash("pager")) {
-%   my @pages = extended_pager($pager);
+%   my ($pages, $shortcuts) = {extended_pager($pager)}->@{qw(pages shortcuts)};
 <footer>
   <nav class="text-center pager">
-    <%= link_to "<<" => url_with->query({page => $pager->{first_page}})
-        if $pager->{first_page} < $pages[0] %>
-    <%= link_to "<" => url_with->query({page => $pager->{previous_page}})
-        if defined($pager->{previous_page}) &&
-	$pager->{previous_page} > 3 %>
-%   for my $page (@pages) {
+    <%= tag_for_pager_shortcut "<<", $shortcuts->{first_page} %>
+    <%= tag_for_pager_shortcut "<", $shortcuts->{previous_page} %>
+%   for my $page ($pages->@*) {
 %     if ($page == $pager->{current_page}) {
     <span><%= $pager->{current_page} %></span>
 %     } else {
     <%= link_to $page => url_with->query({page => $page}) %>
 %     }
 %   }
-    <%= link_to ">" => url_with->query({page => $pager->{next_page}})
-        if defined($pager->{next_page}) &&
-	$pager->{next_page} < $pager->{last_page} - 2 %>
-    <%= link_to ">>" => url_with->query({page => $pager->{last_page}})
-        if $pager->{last_page} > $pages[-1] %>
+    <%= tag_for_pager_shortcut ">", $shortcuts->{next_page} %>
+    <%= tag_for_pager_shortcut ">>", $shortcuts->{last_page} %>
   </nav>
 </footer>
 % }