diff --git a/public/app/panels/table/module.html b/public/app/panels/table/module.html
index 030324c325c..75b9b4ce136 100644
--- a/public/app/panels/table/module.html
+++ b/public/app/panels/table/module.html
@@ -7,7 +7,7 @@
 					<thead>
 						<tr>
 							<th ng-repeat="col in table.columns">
-								<div class="table-panel-table-header-inner" ng-click="toggleColumnSort(col, $index)">
+								<div class="table-panel-table-header-inner pointer" ng-click="toggleColumnSort(col, $index)">
 									{{col.text}}
 									<span class="table-panel-table-header-controls" ng-if="col.sort">
 										<i class="fa fa-caret-down" ng-show="col.desc"></i>
diff --git a/public/app/panels/table/module.ts b/public/app/panels/table/module.ts
index beb6273fd62..9ed800f827c 100644
--- a/public/app/panels/table/module.ts
+++ b/public/app/panels/table/module.ts
@@ -37,9 +37,14 @@ export function tablePanel() {
       }
 
       function appendPaginationControls(footerElem) {
-        var paginationList = $('<ul></ul>');
+        footerElem.empty();
 
-        var pageCount = data.rows.length / panel.pageSize;
+        var pageCount = Math.ceil(data.rows.length / panel.pageSize);
+        if (pageCount === 1) {
+          return;
+        }
+
+        var paginationList = $('<ul></ul>');
         for (var i = 0; i < pageCount; i++) {
           var pageLinkElem = $('<li><a href="#">' + (i+1) + '</a></li>');
           paginationList.append(pageLinkElem);
@@ -48,7 +53,6 @@ export function tablePanel() {
         var nextLink = $('<li><a href="#">»</a></li>');
         paginationList.append(nextLink);
 
-        footerElem.empty();
         footerElem.append(paginationList);
       }