diff --git a/templates/table/layout.hamlet b/templates/table/layout.hamlet
index bc0fbd289..ed4677c7a 100644
--- a/templates/table/layout.hamlet
+++ b/templates/table/layout.hamlet
@@ -3,10 +3,10 @@ $if null rows && (dbsEmptyStyle == DBESNoHeading)
   _{dbsEmptyMessage}
 $else
   ^{table}
-  $if pageCount > 1
-    <div .pagination>
-      <form .pagesize method=GET enctype=#{pagesizeEnc} action=#{rawAction}>
-        ^{pagesizeWdgt}
+  <div .pagination>
+    <form .pagesize method=GET enctype=#{pagesizeEnc} action=#{rawAction}>
+      ^{pagesizeWdgt}
+    $if pageCount > 1
       <ul ##{wIdent "pagination"} .pages>
         $forall p <- pageNumbers
           <li .page-link :p == psPage:.current>
diff --git a/templates/table/layout.lucius b/templates/table/layout.lucius
index c34095855..93b19d264 100644
--- a/templates/table/layout.lucius
+++ b/templates/table/layout.lucius
@@ -2,7 +2,7 @@
 .pagination {
     margin-top: 20px;
     display: flex;
-    flex-direction: row;
+    flex-direction: column-reverse;
 
     .pagesize {
         float: left;