diff --git a/ui/src/chronograf/components/Panel.js b/ui/src/chronograf/components/Panel.js
index df04fc1682..1e39bd373b 100644
--- a/ui/src/chronograf/components/Panel.js
+++ b/ui/src/chronograf/components/Panel.js
@@ -3,6 +3,7 @@ import classNames from 'classnames';
 import QueryEditor from './QueryEditor';
 import QueryTabItem from './QueryTabItem';
 import RenamePanelModal from './RenamePanelModal';
+import SimpleDropdown from 'src/shared/components/SimpleDropdown';
 
 const {shape, func, bool, arrayOf} = PropTypes;
 const Panel = React.createClass({
@@ -32,7 +33,6 @@ const Panel = React.createClass({
 
   getInitialState() {
     return {
-      showAddQueryOptions: false,
       activeQueryId: null,
     };
   },
@@ -41,18 +41,12 @@ const Panel = React.createClass({
     this.setState({activeQueryId: query.id});
   },
 
-  toggleAddQueryOptions() {
-    this.setState({showAddQueryOptions: !this.state.showAddQueryOptions});
-  },
-
   handleAddQuery() {
     this.props.actions.addQuery();
-    this.setState({showAddQueryOptions: false});
   },
 
   handleAddRawQuery() {
     this.props.actions.addQuery({rawText: `SELECT "fields" from "db"."rp"."measurement"`});
-    this.setState({showAddQueryOptions: false});
   },
 
   handleDeleteQuery(query) {
@@ -163,22 +157,24 @@ const Panel = React.createClass({
     );
   },
 
-  renderAddQuery() {
-    const {showAddQueryOptions} = this.state;
-    if (showAddQueryOptions) {
-      return (
-        <div className="btn-group btn-group-sm">
-          <button type="button" className="btn btn-default" onClick={this.handleAddQuery}>Builder</button>
-          <button type="button" className="btn btn-default" onClick={this.handleAddRawQuery}>Raw</button>
-          <button type="button" className="btn btn-default" onClick={this.toggleAddQueryOptions}>X</button>
-        </div>
-      );
+  onChoose(item) {
+    switch (item.text) {
+      case 'Builder':
+        this.handleAddQuery();
+        break;
+      case 'Raw':
+        this.handleAddRawQuery();
+        break;
     }
+  },
 
+  renderAddQuery() {
     return (
-      <div className="panel--tab" onClick={this.toggleAddQueryOptions}>
-        <span className="icon plus"></span>
-      </div>
+      <SimpleDropdown onChoose={this.onChoose} items={[{text: 'Builder'}, {text: 'Raw'}]} className="editor-chooser">
+        <div className="panel--tab">
+          <span className="icon plus"></span>
+        </div>
+      </SimpleDropdown>
     );
   },
 });
diff --git a/ui/src/shared/components/SimpleDropdown.js b/ui/src/shared/components/SimpleDropdown.js
new file mode 100644
index 0000000000..5ca70f30d4
--- /dev/null
+++ b/ui/src/shared/components/SimpleDropdown.js
@@ -0,0 +1,56 @@
+import React, {PropTypes} from 'react';
+import OnClickOutside from 'shared/components/OnClickOutside';
+
+const Dropdown = React.createClass({
+  propTypes: {
+    children: PropTypes.node.isRequired,
+    items: PropTypes.arrayOf(PropTypes.shape({
+      text: PropTypes.string.isRequired,
+    })).isRequired,
+    onChoose: PropTypes.func.isRequired,
+    className: PropTypes.string,
+  },
+  getInitialState() {
+    return {
+      isOpen: false,
+    };
+  },
+  handleClickOutside() {
+    this.setState({isOpen: false});
+  },
+  handleSelection(item) {
+    this.toggleMenu();
+    this.props.onChoose(item);
+  },
+  toggleMenu(e) {
+    if (e) {
+      e.stopPropagation();
+    }
+    this.setState({isOpen: !this.state.isOpen});
+  },
+  render() {
+    const self = this;
+    const {items, className} = self.props;
+
+    return (
+      <div onClick={this.toggleMenu} className={`dropdown ${className}`}>
+        <div className="btn btn-sm btn-info dropdown-toggle">
+          {this.props.children}
+        </div>
+        {self.state.isOpen ?
+          <ul className="dropdown-menu show">
+            {items.map((item, i) => {
+              return (
+                <li className="dropdown-item" key={i} onClick={() => self.handleSelection(item)}>
+                  {item.text}
+                </li>
+              );
+            })}
+          </ul>
+          : null}
+      </div>
+    );
+  },
+});
+
+export default OnClickOutside(Dropdown);