diff --git a/public/app/features/plugins/partials/plugin_edit.html b/public/app/features/plugins/partials/plugin_edit.html
index d5f69df2366..46971bd35e7 100644
--- a/public/app/features/plugins/partials/plugin_edit.html
+++ b/public/app/features/plugins/partials/plugin_edit.html
@@ -55,6 +55,11 @@
       <section class="page-sidebar-section">
         <h4>Version</h4>
         <span>{{ctrl.model.info.version}}</span>
+				<div ng-show="ctrl.model.hasUpdate">
+					<a href="https://grafana.net/plugins/{{ctrl.model.id}}" target="_blank">
+						Update Available!
+					</a>
+				</div>
       </section>
       <section class="page-sidebar-section" ng-show="ctrl.model.type === 'app'">
         <h5>Includes</h4>
diff --git a/public/app/plugins/panel/pluginlist/module.html b/public/app/plugins/panel/pluginlist/module.html
index 9ee9e2167cf..05869911d73 100644
--- a/public/app/plugins/panel/pluginlist/module.html
+++ b/public/app/plugins/panel/pluginlist/module.html
@@ -1,9 +1,8 @@
 <div class="pluginlist">
 	<div class="pluginlist-section" ng-repeat="category in ctrl.viewModel">
-		<h5 class="pluginlist-section-header">
-			<i class="icon-gf icon-gf-{{category.type}} pluginlist-icon"></i>
+		<h6 class="pluginlist-section-header">
 			{{category.header}}
-		</h5>
+		</h6>
 		<div class="pluginlist-item" ng-repeat="plugin in category.list">
 			<a class="pluginlist-link pluginlist-link-{{plugin.state}}" href="plugins/{{plugin.id}}/edit">
 				<img ng-src="{{plugin.info.logos.small}}" class="pluginlist-image">
@@ -12,7 +11,7 @@
 				<span class="pluginlist-message pluginlist-message--update" ng-show="plugin.hasUpdate">
 					Update available!
 				</span>
-				<span class="pluginlist-message pluginlist-message--enable" ng-show="!plugin.enabled">
+				<span class="pluginlist-message pluginlist-message--enable" ng-show="!plugin.enabled && !plugin.hasUpdate">
 					Enable now
 				</span>
 				<span class="pluginlist-message pluginlist-message--no-update" ng-show="plugin.enabled && !plugin.hasUpdate">
diff --git a/public/app/plugins/panel/pluginlist/module.ts b/public/app/plugins/panel/pluginlist/module.ts
index 015bd2ab340..9a9c544a7ec 100644
--- a/public/app/plugins/panel/pluginlist/module.ts
+++ b/public/app/plugins/panel/pluginlist/module.ts
@@ -26,6 +26,7 @@ class DashListCtrl extends PanelCtrl {
       {header: "Installed Panels", list: [], type: 'panel'},
       {header: "Installed Datasources", list: [], type: 'datasource'},
     ];
+
     this.update();
   }
 
@@ -42,30 +43,10 @@ class DashListCtrl extends PanelCtrl {
       this.viewModel[2].list = _.filter(plugins, {type: 'datasource'});
 
       for (let plugin of this.pluginList) {
-        if (!plugin.enabled) {
-          plugin.state = 'not-enabled';
-        }
-      }
-
-    }).then(this.checkForUpdates.bind(this));
-  }
-
-  checkForUpdates() {
-    return this.backendSrv.get('api/gnet/plugins/repo').then(data => {
-      var gNetPlugins = _.reduce(data.plugins, (memo, val) => {
-        memo[val.id] = val;
-        return memo;
-      }, {});
-
-      for (let plugin of this.pluginList) {
-        var source = gNetPlugins[plugin.id];
-        if (!source) {
-          continue;
-        }
-
-        if (plugin.info.version !== source.versions[0].version) {
-          plugin.hasUpdate = true;
+        if (plugin.hasUpdate) {
           plugin.state = 'has-update';
+        } else if (!plugin.enabled) {
+          plugin.state = 'not-enabled';
         }
       }
     });
diff --git a/public/sass/components/_panel_pluginlist.scss b/public/sass/components/_panel_pluginlist.scss
index 711565a9480..0d02196e975 100644
--- a/public/sass/components/_panel_pluginlist.scss
+++ b/public/sass/components/_panel_pluginlist.scss
@@ -29,7 +29,7 @@
 }
 
 .pluginlist-title {
-    margin-right: $spacer / 3;
+  margin-right: $spacer / 3;
 }
 
 .pluginlist-version {