diff --git a/public/app/plugins/panel/text/TextPanel.tsx b/public/app/plugins/panel/text/TextPanel.tsx
index 4cbbb322f48..043f5dea9a3 100644
--- a/public/app/plugins/panel/text/TextPanel.tsx
+++ b/public/app/plugins/panel/text/TextPanel.tsx
@@ -6,6 +6,8 @@ import { PanelProps, renderMarkdown, textUtil } from '@grafana/data';
 import config from 'app/core/config';
 // Types
 import { TextOptions } from './types';
+import { stylesFactory } from '@grafana/ui';
+import { css, cx } from 'emotion';
 
 interface Props extends PanelProps<TextOptions> {}
 interface State {
@@ -75,7 +77,16 @@ export class TextPanel extends PureComponent<Props, State> {
 
   render() {
     const { html } = this.state;
+    const styles = getStyles();
 
-    return <div className="markdown-html panel-text-content" dangerouslySetInnerHTML={{ __html: html }} />;
+    return <div className={cx('markdown-html', styles.content)} dangerouslySetInnerHTML={{ __html: html }} />;
   }
 }
+
+const getStyles = stylesFactory(() => {
+  return {
+    content: css`
+      height: 100%;
+    `,
+  };
+});