diff --git a/public/app/panels/table/controller.ts b/public/app/panels/table/controller.ts
index 270e2f65a3d..54deb28b11e 100644
--- a/public/app/panels/table/controller.ts
+++ b/public/app/panels/table/controller.ts
@@ -26,7 +26,7 @@ export class TablePanelCtrl {
 
     var panelDefaults = {
       targets: [{}],
-      transform: 'timeseries_to_rows',
+      transform: 'timeseries_to_columns',
       pageSize: null,
       showHeader: true,
       styles: [
diff --git a/public/app/panels/table/renderer.ts b/public/app/panels/table/renderer.ts
index a55a8bf2fac..c782cce3579 100644
--- a/public/app/panels/table/renderer.ts
+++ b/public/app/panels/table/renderer.ts
@@ -112,7 +112,7 @@ export class TableRenderer {
     // this hack adds header content to cell (not visible)
     var widthHack = '';
     if (addWidthHack) {
-      widthHack = '<div class="table-panel-width-hack">' + this.table.columns[columnIndex].text + '<div>';
+      widthHack = '<div class="table-panel-width-hack">' + this.table.columns[columnIndex].text + '</div>';
     }
 
     return '<td' + style + '>' + value + widthHack + '</td>';