diff --git a/public/app/features/explore/Table/TableContainer.tsx b/public/app/features/explore/Table/TableContainer.tsx
index 3019fbff83e..8bbaa02ec7e 100644
--- a/public/app/features/explore/Table/TableContainer.tsx
+++ b/public/app/features/explore/Table/TableContainer.tsx
@@ -50,6 +50,14 @@ export class TableContainer extends PureComponent<Props> {
     return Math.min(600, Math.max(rowCount * 36, hasSubFrames ? 300 : 0) + 40 + 46);
   }
 
+  getTableTitle(dataFrames: DataFrame[] | null, data: DataFrame, i: number) {
+    let title = data.name ? `Table - ${data.name}` : 'Table';
+    if (dataFrames && dataFrames.length > 1) {
+      title = `Table - ${data.name || data.refId || i}`;
+    }
+    return title;
+  }
+
   render() {
     const { loading, onCellFilterAdded, tableResult, width, splitOpenFn, range, ariaLabel, timeZone } = this.props;
 
@@ -88,7 +96,7 @@ export class TableContainer extends PureComponent<Props> {
           frames.map((data, i) => (
             <PanelChrome
               key={data.refId || `table-${i}`}
-              title={dataFrames && dataFrames.length > 1 ? `Table - ${data.name || data.refId || i}` : 'Table'}
+              title={this.getTableTitle(dataFrames, data, i)}
               width={width}
               height={this.getTableHeight(data.length, this.hasSubFrames(data))}
               loadingState={loading ? LoadingState.Loading : undefined}