diff --git a/frontend/src/metabase/query_builder/components/filters/pickers/TextPicker.jsx b/frontend/src/metabase/query_builder/components/filters/pickers/TextPicker.jsx
index 79aee06e4f65879b0b59eaec7f3bfd8401ac14e4..bbc613480c69b5e6235bbf16fd1dd3828daa06dc 100644
--- a/frontend/src/metabase/query_builder/components/filters/pickers/TextPicker.jsx
+++ b/frontend/src/metabase/query_builder/components/filters/pickers/TextPicker.jsx
@@ -1,6 +1,7 @@
 /* @flow */
 
 import React, {Component, PropTypes} from "react";
+import AutosizeTextarea from 'react-textarea-autosize';
 
 import cx from "classnames";
 import _ from "underscore";
@@ -31,7 +32,8 @@ export default class TextPicker extends Component<*, Props, *> {
 
     setValue(fieldString: string|null) {
         const fieldIsNonEmpty = fieldString !== null && fieldString !== "";
-        const values = fieldIsNonEmpty ? fieldString.split(',') : [null];
+        const newLineRegex = /\r?\n|\r/g;
+        const values = fieldIsNonEmpty ? fieldString.replace(newLineRegex,'').split(',') : [null];
         this.props.onValuesChange(values);
     }
 
@@ -48,7 +50,7 @@ export default class TextPicker extends Component<*, Props, *> {
         return (
             <div>
                 <div className="FilterInput px1 pt1 relative">
-                    <input
+                    <AutosizeTextarea
                         className={cx("input block full border-purple", { "border-error": hasInvalidValues })}
                         type="text"
                         value={values.join(',')}
@@ -56,6 +58,8 @@ export default class TextPicker extends Component<*, Props, *> {
                         onKeyPress={commitOnEnter}
                         placeholder={this.props.placeholder}
                         autoFocus={true}
+                        style={{resize: "none"}}
+                        maxRows={8}
                     />
                 </div>
 
diff --git a/package.json b/package.json
index c549047e0d4b4727832223e050110a373deffc96..328dad28c03c24a7f3a5b086bae4e500a059dc5a 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
     "react-router": "^3.0.0",
     "react-router-redux": "^4.0.8",
     "react-sortable": "^1.2.0",
+    "react-textarea-autosize": "^4.0.5",
     "react-virtualized": "^8.6.0",
     "recompose": "^0.21.2",
     "redux": "^3.5.2",
diff --git a/yarn.lock b/yarn.lock
index 8aef53aebea3dd7db8f6b76d635e7b27af4f7057..f28ed330b99db05b3afee98dd1dbac58bf466ff5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6557,6 +6557,10 @@ react-test-renderer@^15.4.2:
     fbjs "^0.8.4"
     object-assign "^4.1.0"
 
+react-textarea-autosize@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-4.0.5.tgz#55379f6a6fa575fc87d1b8de2756e57e3b6c995d"
+
 react-virtualized@^8.6.0:
   version "8.11.4"
   resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-8.11.4.tgz#0bb94f1ecbd286d07145ce63983d0a11724522c0"