diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs
index 76a988ddb..f00426e45 100644
--- a/src/Handler/Utils/Table/Pagination.hs
+++ b/src/Handler/Utils/Table/Pagination.hs
@@ -25,6 +25,8 @@ import Yesod.Colonnade
 
 import Text.Hamlet (hamletFile)
 
+import Data.Ratio ((%))
+
 
 data SortColumn = forall a. PersistField a => SortColumn { getSortColumn :: E.SqlExpr (E.Value a) }
 data SortDirection = SortAsc | SortDesc
@@ -121,6 +123,7 @@ dbTable PSValidator{..} DBTable{ dbtIdent = (toPathPiece -> dbtIdent), .. } = do
 
   bool return (sendResponse <=< tblLayout) psShortcircuit $ do
     let table = encodeCellTable dbtAttrs' dbtColonnade rows
+        pageCount = max 1 . ceiling $ rowCount % psLimit
     $(widgetFile "table-layout")
   where
     tblLayout :: Widget -> Handler Html
diff --git a/templates/table-layout.hamlet b/templates/table-layout.hamlet
index 323be24bb..d268dad12 100644
--- a/templates/table-layout.hamlet
+++ b/templates/table-layout.hamlet
@@ -1,4 +1,4 @@
 <div .table>
   ^{table}
   <p style="text-align:center">
-    _{MsgPage (succ psPage) (succ $ div rowCount psLimit)}
+    _{MsgPage (succ psPage) pageCount}