diff --git a/public/app/features/dashboard/dashgrid/PanelChrome.tsx b/public/app/features/dashboard/dashgrid/PanelChrome.tsx
index 4a4669a3950..818dbb6d155 100644
--- a/public/app/features/dashboard/dashgrid/PanelChrome.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelChrome.tsx
@@ -72,25 +72,17 @@ export class PanelChrome extends PureComponent<Props, State> {
   }
 
   render() {
-    const { panel, dashboard, getMenuAdditional } = this.props;
+    const { panel, dashboard } = this.props;
     const { refreshCounter, timeRange, renderCounter } = this.state;
 
     const { datasource, targets } = panel;
     const PanelComponent = this.props.component;
-    const panelSpecificMenuOptions = getMenuAdditional(panel);
-    const additionalMenuItems = panelSpecificMenuOptions.additionalMenuItems || undefined;
-    const additionalSubMenuItems = panelSpecificMenuOptions.additionalSubMenuItems || undefined;
 
     console.log('panelChrome render');
     return (
       <div className="panel-container">
         <PanelHeader title={panel.title}>
-          <PanelHeaderMenu
-            panel={panel}
-            dashboard={dashboard}
-            additionalMenuItems={additionalMenuItems}
-            additionalSubMenuItems={additionalSubMenuItems}
-          />
+          <PanelHeaderMenu panel={panel} dashboard={dashboard} />
         </PanelHeader>
         <div className="panel-content">
           <DataPanel
diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenu.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenu.tsx
index aa55a35743f..dfb83be9d1d 100644
--- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenu.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenu.tsx
@@ -19,7 +19,7 @@ export class PanelHeaderMenu extends PureComponent<PanelHeaderMenuProps, any> {
         {menu.map((menuItem, idx: number) => {
           return (
             <PanelHeaderMenuItem
-              key={idx} // TODO: Fix proper key
+              key={`${menuItem.text}${idx}`}
               type={menuItem.type}
               text={menuItem.text}
               iconClassName={menuItem.iconClassName}