diff --git a/public/app/features/dashboard/partials/panel_info.html b/public/app/features/dashboard/partials/panel_info.html
index cdccf679829..de863eaa258 100644
--- a/public/app/features/dashboard/partials/panel_info.html
+++ b/public/app/features/dashboard/partials/panel_info.html
@@ -10,7 +10,7 @@
 		</a>
 	</div>
 
-	<div class="modal-content" ng-bind-html="html">
+	<div class="modal-content markdown-html" ng-bind-html="html">
 	</div>
 
 </div>
diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts
index af282b99935..32563519991 100644
--- a/public/app/features/panel/panel_ctrl.ts
+++ b/public/app/features/panel/panel_ctrl.ts
@@ -263,7 +263,9 @@ export class PanelCtrl {
     var linkSrv = this.$injector.get('linkSrv');
     var templateSrv = this.$injector.get('templateSrv');
     var interpolatedMarkdown = templateSrv.replace(markdown, this.panel.scopedVars);
-    var html = new Remarkable().render(interpolatedMarkdown);
+    var html = '<div class="markdown-html">';
+
+    html += new Remarkable().render(interpolatedMarkdown);
 
     if (this.panel.links && this.panel.links.length > 0) {
       html += '<ul>';
@@ -274,7 +276,7 @@ export class PanelCtrl {
       html += '</ul>';
     }
 
-    return html;
+    return html + '</div>';
   }
 
   openInfo() {
diff --git a/public/app/features/plugins/partials/plugin_edit.html b/public/app/features/plugins/partials/plugin_edit.html
index 2acb3eef8bf..e6659191961 100644
--- a/public/app/features/plugins/partials/plugin_edit.html
+++ b/public/app/features/plugins/partials/plugin_edit.html
@@ -31,7 +31,7 @@
 
   <div class="page-body">
     <div class="tab-content page-content-with-sidebar" ng-if="ctrl.tabs[ctrl.tabIndex] === 'Readme'">
-      <div ng-bind-html="ctrl.readmeHtml" class="plugin-markdown-readme">
+      <div ng-bind-html="ctrl.readmeHtml" class="markdown-html">
       </div>
     </div>
 
diff --git a/public/app/plugins/panel/text/module.html b/public/app/plugins/panel/text/module.html
index 4ed7806753d..9fcf5a9f557 100644
--- a/public/app/plugins/panel/text/module.html
+++ b/public/app/plugins/panel/text/module.html
@@ -1,2 +1,2 @@
-<p class="panel-text-content" ng-bind-html="ctrl.content" ng-show="ctrl.content">
+<p class="markdown-html panel-text-content" ng-bind-html="ctrl.content" ng-show="ctrl.content">
 </p>
diff --git a/public/sass/base/_type.scss b/public/sass/base/_type.scss
index f165d40e2eb..f400bb8f57a 100644
--- a/public/sass/base/_type.scss
+++ b/public/sass/base/_type.scss
@@ -290,3 +290,42 @@ a.external-link {
 .pointer {
   cursor: pointer;
 }
+
+.markdown-html {
+  img {
+    max-width: 100%;
+  }
+
+  ul {
+    padding-left: $spacer*1.5;
+    margin-bottom: $spacer;
+  }
+
+  table {
+    td, th {
+      padding: $spacer*.5 $spacer;
+    }
+    th {
+      font-weight: normal;
+      background: $table-bg-accent;
+    }
+  }
+
+  table, th, td {
+    border: 1px solid $table-border;
+    border-collapse: collapse;
+  }
+
+  a {
+    text-decoration: underline;
+    color: $external-link-color;
+    &:hover {
+      color: lighten($external-link-color, 10%);
+    }
+  }
+
+  p:last-child {
+    margin-bottom: 0;
+  }
+}
+
diff --git a/public/sass/components/_drop.scss b/public/sass/components/_drop.scss
index 27264481c13..6f3aff23cef 100644
--- a/public/sass/components/_drop.scss
+++ b/public/sass/components/_drop.scss
@@ -29,12 +29,11 @@ $easing: cubic-bezier(0, 0, 0.265, 1.00);
 }
 
 .drop-help {
-  ul {
-    padding-left: $spacer;
-  }
-
   a {
-    text-decoration: underline;
+    color: $white;
+    &:hover {
+      color: darken($white, 10%);
+    }
   }
 }
 
diff --git a/public/sass/components/_panel_text.scss b/public/sass/components/_panel_text.scss
index 6e0301cecc5..8b137891791 100644
--- a/public/sass/components/_panel_text.scss
+++ b/public/sass/components/_panel_text.scss
@@ -1,8 +1 @@
 
-.panel-text-content {
-  ul {
-    margin: 0 0 $spacer $spacer * 1.5;
-  }
-  li {line-height: 2;}
-  a { color: $external-link-color; }
-}
diff --git a/public/sass/pages/_plugins.scss b/public/sass/pages/_plugins.scss
index ed4d39d316f..075a7f1649c 100644
--- a/public/sass/pages/_plugins.scss
+++ b/public/sass/pages/_plugins.scss
@@ -37,32 +37,6 @@
   overflow: hidden;
 }
 
-.plugin-markdown-readme {
-  img {
-    max-width: 100%;
-  }
-
-  ul {
-    padding-left: $spacer*1.5;
-    margin-bottom: $spacer*2;
-  }
-
-  table {
-    td, th {
-      padding: $spacer*.5 $spacer;
-    }
-    th {
-      font-weight: normal;
-      background: $table-bg-accent;
-    }
-  }
-
-  table, th, td {
-    border: 1px solid $table-border;
-    border-collapse: collapse;
-  }
-}
-
 .get-more-plugins-link {
   color: $text-muted;
   font-size: $font-size-sm;