diff --git a/src/app/panels/table/module.html b/src/app/panels/table/module.html
index e9573986faf..e12c280afdf 100755
--- a/src/app/panels/table/module.html
+++ b/src/app/panels/table/module.html
@@ -10,16 +10,19 @@
     <div ng-class="{'span3':panel.field_list}" ng-show="panel.field_list">
       <div class="sidebar-nav">
         <strong>Fields <i class=" icon-chevron-sign-left pointer " ng-click="panel.field_list = !panel.field_list" bs-tooltip="'Hide field list'" ng-show="panel.field_list"></i></strong><p>
-        <span class="small">
+        <div class="small">
           <span class="link" ng-click="panel.all_fields = true;" ng-class="{strong:panel.all_fields}">All</span> /
            <span class="link" ng-click="panel.all_fields = false;" ng-class="{strong:!panel.all_fields}">Current</span>
-        </span>
+        </div>
+        <div><input type="text" class="input-medium" placeholder="Type to filter..." ng-model="fieldFilter"></div>
+
+
         <ul class="unstyled" style="{{panel.overflow}}:{{panel.height || row.height}};overflow-y:auto;overflow-x:hidden;">
-          <li ng-style="panel.style" ng-repeat="field in fields.list" ng-show="panel.all_fields">
+          <li ng-style="panel.style" ng-repeat="field in fields.list|filter:fieldFilter" ng-show="panel.all_fields">
             <i class="pointer" ng-class="{'icon-check': _.contains(panel.fields,field),'icon-check-empty': !_.contains(panel.fields,field)}" ng-click="toggle_field(field)"></i>
             <a class="pointer" data-unique="1" bs-popover="'app/panels/table/micropanel.html'" data-placement="rightTop" ng-click="toggle_micropanel(field,true)" ng-class="{label: _.contains(panel.fields,field)}">{{field}}</a>
           </li>
-          <li ng-style="panel.style" ng-repeat="field in current_fields" ng-hide="panel.all_fields">
+          <li ng-style="panel.style" ng-repeat="field in current_fields|filter:fieldFilter" ng-hide="panel.all_fields">
             <i class="pointer" ng-class="{'icon-check': _.contains(panel.fields,field),'icon-check-empty': !_.contains(panel.fields,field)}" ng-click="toggle_field(field)"></i>
             <a class="pointer" data-unique="1" bs-popover="'app/panels/table/micropanel.html'" data-placement="rightTop" ng-click="toggle_micropanel(field,true)" ng-class="{label: _.contains(panel.fields,field)}">{{field}}</a>
           </li>