diff --git a/public/app/features/plugins/page_ctrl.ts b/public/app/features/plugins/page_ctrl.ts
index 15b08ca1cfe..9157f14202e 100644
--- a/public/app/features/plugins/page_ctrl.ts
+++ b/public/app/features/plugins/page_ctrl.ts
@@ -5,14 +5,13 @@ import _ from 'lodash';
 
 export class AppPageCtrl {
   page: any;
-  appId: any;
+  pluginId: any;
   appModel: any;
 
   /** @ngInject */
   constructor(private backendSrv, private $routeParams: any, private $rootScope) {
-    this.appId = $routeParams.appId;
-
-    this.backendSrv.get(`/api/org/apps/${this.appId}/settings`).then(app => {
+    this.pluginId = $routeParams.pluginId;
+    this.backendSrv.get(`/api/org/plugins/${this.pluginId}/settings`).then(app => {
       this.appModel = app;
       this.page = _.findWhere(app.pages, {slug: this.$routeParams.slug});
       if (!this.page) {
diff --git a/public/app/features/plugins/partials/edit.html b/public/app/features/plugins/partials/edit.html
index 8747ac66610..815e165cc85 100644
--- a/public/app/features/plugins/partials/edit.html
+++ b/public/app/features/plugins/partials/edit.html
@@ -72,7 +72,7 @@
 						{{ds.name}}
 					</li>
 					<li ng-repeat="page in ctrl.model.pages">
-						<a href="apps/{{ctrl.appId}}/page/{{page.slug}}" class="external-link">{{page.name}}</a>
+						<a href="plugins/{{ctrl.pluginId}}/page/{{page.slug}}" class="external-link">{{page.name}}</a>
 					</li>
 				</ul>
 			</section>
diff --git a/public/app/features/plugins/partials/page.html b/public/app/features/plugins/partials/page.html
index c65053b47fe..db6d64457bf 100644
--- a/public/app/features/plugins/partials/page.html
+++ b/public/app/features/plugins/partials/page.html
@@ -1,4 +1,4 @@
-<navbar icon="icon-gf icon-gf-apps" title="{{ctrl.appModel.name}}" title-url="apps/{{ctrl.appId}}/edit">
+<navbar icon="icon-gf icon-gf-apps" title="{{ctrl.appModel.name}}" title-url="apps/{{ctrl.pluginId}}/edit">
 </navbar>
 
 <div class="page-container">