diff --git a/public/app/features/dashboard/components/PanelEditor/state/selectors.ts b/public/app/features/dashboard/components/PanelEditor/state/selectors.ts
index cea95a53496..195caa45c7f 100644
--- a/public/app/features/dashboard/components/PanelEditor/state/selectors.ts
+++ b/public/app/features/dashboard/components/PanelEditor/state/selectors.ts
@@ -43,7 +43,7 @@ export const getPanelEditorTabs = memoizeOne((location: LocationState, plugin?:
     });
   }
 
-  const activeTab = tabs.find(item => item.id === location.query.tab || defaultTab) ?? tabs[0];
+  const activeTab = tabs.find(item => item.id === (location.query.tab || defaultTab)) ?? tabs[0];
   activeTab.active = true;
 
   return tabs;
diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx
index 3ce57f130f3..686c39eb1c9 100644
--- a/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx
+++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationsEditor.tsx
@@ -125,6 +125,7 @@ export class TransformationsEditor extends React.PureComponent<Props> {
           {standardTransformersRegistry.list().map(t => {
             return (
               <TransformationCard
+                key={t.name}
                 title={t.name}
                 description={t.description}
                 actions={<Button>Select</Button>}