diff --git a/public/app/plugins/panel/table/module.ts b/public/app/plugins/panel/table/module.ts
index 27eab205f09..51caed86c25 100644
--- a/public/app/plugins/panel/table/module.ts
+++ b/public/app/plugins/panel/table/module.ts
@@ -218,13 +218,13 @@ class TablePanelCtrl extends MetricsPanelCtrl {
     }
 
     function renderPanel() {
-      var panelElem = elem.parents('.panel');
+      var panelElem = elem.parents('.panel-content');
       var rootElem = elem.find('.table-panel-scroll');
       var tbodyElem = elem.find('tbody');
       var footerElem = elem.find('.table-panel-footer');
 
       elem.css({ 'font-size': panel.fontSize });
-      panelElem.addClass('table-panel-wrapper');
+      panelElem.addClass('table-panel-content');
 
       appendTableRows(tbodyElem);
       appendPaginationControls(footerElem);
diff --git a/public/sass/components/_panel_table.scss b/public/sass/components/_panel_table.scss
index f120fcc8b35..8e0ecf15896 100644
--- a/public/sass/components/_panel_table.scss
+++ b/public/sass/components/_panel_table.scss
@@ -1,7 +1,6 @@
-.table-panel-wrapper {
-  .panel-content {
-    padding: 0;
-  }
+.table-panel-content {
+  padding: 0;
+
   .panel-title-container {
     padding-bottom: 4px;
   }