diff --git a/public/app/features/panel/GeneralTabCtrl.ts b/public/app/features/panel/GeneralTabCtrl.ts
index 75edd72027b..9db13713ce1 100644
--- a/public/app/features/panel/GeneralTabCtrl.ts
+++ b/public/app/features/panel/GeneralTabCtrl.ts
@@ -24,7 +24,7 @@ export class GeneralTabCtrl {
       const panelPropsString = panelPropsToTrack
         .map(prop => prop + '=' + (panel[prop] && panel[prop].toString ? panel[prop].toString() : panel[prop]))
         .join();
-      const panelLinks = panel.links;
+      const panelLinks = panel.links || [];
       const panelLinksString = panelLinks.map(obj2string).join();
       return panelPropsString + panelLinksString;
     };
diff --git a/public/app/features/panel/panellinks/module.ts b/public/app/features/panel/panellinks/module.ts
index c10e4ab224e..99a6975811e 100644
--- a/public/app/features/panel/panellinks/module.ts
+++ b/public/app/features/panel/panellinks/module.ts
@@ -9,7 +9,7 @@ function panelLinksEditor() {
     },
     restrict: 'E',
     controller: 'PanelLinksEditorCtrl',
-    templateUrl: 'public/app/features/dashboard/panellinks/module.html',
+    templateUrl: 'public/app/features/panel/panellinks/module.html',
     link: () => {},
   };
 }