diff --git a/public/app/features/dashboard/panel_editor/EditorTabBody.tsx b/public/app/features/dashboard/panel_editor/EditorTabBody.tsx
index 0413cae8a7b..3183f7a7b24 100644
--- a/public/app/features/dashboard/panel_editor/EditorTabBody.tsx
+++ b/public/app/features/dashboard/panel_editor/EditorTabBody.tsx
@@ -36,7 +36,7 @@ export class EditorTabBody extends PureComponent<Props, State> {
     toolbarItems: [],
   };
 
-  constructor(props) {
+  constructor(props: Props) {
     super(props);
 
     this.state = {
diff --git a/public/app/features/dashboard/panel_editor/VisualizationTab.tsx b/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
index 37f109250a7..efb1caf0cf7 100644
--- a/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
+++ b/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
@@ -1,5 +1,5 @@
 // Libraries
-import React, { PureComponent } from 'react';
+import React, { PureComponent, ChangeEvent } from 'react';
 
 // Utils & Services
 import { AngularComponent, getAngularLoader } from 'app/core/services/AngularLoader';
@@ -31,6 +31,7 @@ interface Props {
 interface State {
   isVizPickerOpen: boolean;
   searchQuery: string;
+  searchResults: PanelPlugin[];
   scrollTop: number;
 }
 
@@ -39,12 +40,13 @@ export class VisualizationTab extends PureComponent<Props, State> {
   angularOptions: AngularComponent;
   searchInput: HTMLElement;
 
-  constructor(props) {
+  constructor(props: Props) {
     super(props);
 
     this.state = {
       isVizPickerOpen: this.props.urlOpenVizPicker,
       searchQuery: '',
+      searchResults: [],
       scrollTop: 0,
     };
   }
@@ -170,7 +172,7 @@ export class VisualizationTab extends PureComponent<Props, State> {
     this.setState({ isVizPickerOpen: false });
   };
 
-  onSearchQueryChange = evt => {
+  onSearchQueryChange = (evt: ChangeEvent<HTMLInputElement>) => {
     const value = evt.target.value;
     this.setState({
       searchQuery: value,
@@ -187,7 +189,7 @@ export class VisualizationTab extends PureComponent<Props, State> {
           <label className="gf-form--has-input-icon">
             <input
               type="text"
-              className="gf-form-input width-13"
+              className={`gf-form-input width-13 ${!this.hasSearchResults ? 'gf-form-input--invalid' : ''}`}
               placeholder=""
               onChange={this.onSearchQueryChange}
               value={searchQuery}
@@ -219,6 +221,16 @@ export class VisualizationTab extends PureComponent<Props, State> {
     }
   };
 
+  setSearchResults = (searchResults: PanelPlugin[]) => {
+    this.setState({
+      searchResults: searchResults
+    });
+  };
+
+  get hasSearchResults () {
+    return this.state.searchResults && this.state.searchResults.length > 0;
+  }
+
   renderHelp = () => <PluginHelp plugin={this.props.plugin} type="help" />;
 
   setScrollTop = (event: React.MouseEvent<HTMLElement>) => {
@@ -251,6 +263,7 @@ export class VisualizationTab extends PureComponent<Props, State> {
               onTypeChanged={this.onTypeChanged}
               searchQuery={searchQuery}
               onClose={this.onCloseVizPicker}
+              onPluginListChange={this.setSearchResults}
             />
           </FadeIn>
           {this.renderPanelOptions()}
diff --git a/public/app/features/dashboard/panel_editor/VizTypePicker.tsx b/public/app/features/dashboard/panel_editor/VizTypePicker.tsx
index f0dd7d0f2c7..f112610e0e6 100644
--- a/public/app/features/dashboard/panel_editor/VizTypePicker.tsx
+++ b/public/app/features/dashboard/panel_editor/VizTypePicker.tsx
@@ -10,13 +10,14 @@ export interface Props {
   onTypeChanged: (newType: PanelPlugin) => void;
   searchQuery: string;
   onClose: () => void;
+  onPluginListChange: (searchResults: PanelPlugin[]) => void;
 }
 
 export class VizTypePicker extends PureComponent<Props> {
   searchInput: HTMLElement;
   pluginList = this.getPanelPlugins('');
 
-  constructor(props) {
+  constructor(props: Props) {
     super(props);
   }
 
@@ -50,7 +51,7 @@ export class VizTypePicker extends PureComponent<Props> {
   };
 
   getFilteredPluginList = (): PanelPlugin[] => {
-    const { searchQuery } = this.props;
+    const { searchQuery, onPluginListChange } = this.props;
     const regex = new RegExp(searchQuery, 'i');
     const pluginList = this.pluginList;
 
@@ -58,6 +59,7 @@ export class VizTypePicker extends PureComponent<Props> {
       return regex.test(item.name);
     });
 
+    onPluginListChange(filtered);
     return filtered;
   };