diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index 6f517cd..a4ea10e 100644
--- a/AssemblyVersion.cs
+++ b/AssemblyVersion.cs
@@ -16,5 +16,5 @@ using System.Reflection;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.2.513")]
-[assembly: AssemblyFileVersion("3.0.2.513")]
+[assembly: AssemblyVersion("3.0.2.514")]
+[assembly: AssemblyFileVersion("3.0.2.514")]
diff --git a/WebApplication/AllPages.aspx.cs b/WebApplication/AllPages.aspx.cs
index 664d807..6bfab6e 100644
--- a/WebApplication/AllPages.aspx.cs
+++ b/WebApplication/AllPages.aspx.cs
@@ -47,6 +47,7 @@ namespace ScrewTurn.Wiki {
 
 				currentPages = GetAllPages();
 				pageSelector.ItemCount = currentPages.Count;
+				pageSelector.PageSize = PageSize;
 
 				string p = Request["Page"];
 				if(!int.TryParse(p, out selectedPage)) selectedPage = 0;
diff --git a/WebApplication/PageSelector.ascx.cs b/WebApplication/PageSelector.ascx.cs
index 4a43c6d..e51bde5 100644
--- a/WebApplication/PageSelector.ascx.cs
+++ b/WebApplication/PageSelector.ascx.cs
@@ -113,7 +113,9 @@ namespace ScrewTurn.Wiki {
 			for(int i = 0; i < pageCount - 1; i++) {
 				result.Add(new ItemBlockRow(i, i * pageSize, pageSize, selectedPage == i));
 			}
-			result.Add(new ItemBlockRow(pageCount - 1, (pageCount - 1) * pageSize, lastPageSize, selectedPage == pageCount - 1));
+			if(itemCount > (pageCount - 1) * pageSize) {
+				result.Add(new ItemBlockRow(pageCount - 1, (pageCount - 1) * pageSize, lastPageSize, selectedPage == pageCount - 1));
+			}
 
 			// Don't display anything if there is only one page
 			if(result.Count > 1) {