diff --git a/src/filter/editor.jsx b/src/filter/editor.jsx
new file mode 100644
index 0000000..a334c97
--- /dev/null
+++ b/src/filter/editor.jsx
@@ -0,0 +1,62 @@
+import React from 'react'
+import Immutable from 'immutable'
+import { PropertyGroup } from '../fields/spec'
+import PureRenderMixin from 'react-addons-pure-render-mixin';
+import inputStyle from '../fields/input.js'
+import GlSpec from 'mapbox-gl-style-spec/reference/latest.min.js'
+
+export default class FilterEditor extends React.Component {
+  static propTypes = {
+    filter: React.PropTypes.array.isRequired,
+    onFilterChanged: React.PropTypes.func.isRequired,
+  }
+
+  constructor(props) {
+    super(props);
+    this.shouldComponentUpdate = PureRenderMixin.shouldComponentUpdate.bind(this);
+  }
+
+  render() {
+    const op = this.props.filter[0]
+    const filters = this.props.filter.slice(1)
+    const filterElems = filters.map(f => {
+      const filterOp = f[0]
+      const prop = f[1]
+      const args = f.slice(2)
+
+      const availableFilterOperators = GlSpec.filter_operator.values
+      const filterOpOptions = availableFilterOperators.map(value => {
+        return <option value={value}>{value}</option>
+      })
+
+      return <div>
+        <select
+          style={{...inputStyle.select, width: '15%'}}
+          value={filterOp}
+        >
+          {filterOpOptions}
+        </select>
+        <input
+          style={{...inputStyle.input, width: '17%'}}
+          value={prop}
+        />
+        <input
+          style={{...inputStyle.input, width: '55%'}}
+          value={args}
+        />
+      </div>
+    })
+
+    return <div>
+      <select
+        style={{...inputStyle.select, width: '15%'}}
+        value={op}
+      >
+        <option value={"all"}>all</option>
+        <option value={"any"}>any</option>
+      </select>
+      <br/>
+      {filterElems}
+    </div>
+  }
+}
diff --git a/src/layers/editor.jsx b/src/layers/editor.jsx
index 44dc174..f579818 100644
--- a/src/layers/editor.jsx
+++ b/src/layers/editor.jsx
@@ -12,6 +12,7 @@ import LineLayer from './line.jsx'
 import SymbolLayer from './symbol.jsx'
 import BackgroundLayer from './background.jsx'
 import SourceEditor from './source.jsx'
+import FilterEditor from '../filter/editor.jsx'
 
 import MdVisibility from 'react-icons/lib/md/visibility'
 import MdVisibilityOff from 'react-icons/lib/md/visibility-off'
@@ -147,6 +148,10 @@ export class LayerEditor extends React.Component {
           <MdDelete />
         </NavItem>
       </Toolbar>
+      <FilterEditor
+        filter={this.props.layer.get('filter').toJSON()}
+        onFilterChanged={console.log}
+      />
        {this.props.layer.get('type') !== 'background' && <SourceEditor
           source={this.props.layer.get('source')}
           sourceLayer={this.props.layer.get('source-layer')}