diff --git a/core/src/plugins/editor.ajxp_datagrid/ajxp_datagrid.css b/core/src/plugins/editor.ajxp_datagrid/ajxp_datagrid.css
index 4f69f6f019..57d3e396ef 100644
--- a/core/src/plugins/editor.ajxp_datagrid/ajxp_datagrid.css
+++ b/core/src/plugins/editor.ajxp_datagrid/ajxp_datagrid.css
@@ -27,5 +27,5 @@
     font-size: 11px;
     letter-spacing: 1px;
     color: rgb(71,71,71);
-    padding-left: 0;
+    padding-left: 3px;
 }
\ No newline at end of file
diff --git a/core/src/plugins/editor.ajxp_datagrid/class.AjxpDataGridEditor.js b/core/src/plugins/editor.ajxp_datagrid/class.AjxpDataGridEditor.js
index e65bac8319..ad356898aa 100644
--- a/core/src/plugins/editor.ajxp_datagrid/class.AjxpDataGridEditor.js
+++ b/core/src/plugins/editor.ajxp_datagrid/class.AjxpDataGridEditor.js
@@ -51,7 +51,17 @@ Class.create("AjxpDataGridEditor", AbstractEditor, {
                     this.fRP.reloadDataModel();
                 }.bind(this));
             }
-        }else if(aName == 'copy_as_text'){
+        } else if(aName == 'filter' && this.fRP){
+            if(!this.htmlElement.down("#filterButton")){
+                this.htmlElement.down(".editor_action_bar").insert('' +
+                    '<a id="filterButton" class="icon-filter" title="Filter">' +
+                    '   <span message_id="235" class="actionbar_button_label">Filter</span>' +
+                    '</a>');
+                this.htmlElement.down("#filterButton").observe("click", function(){
+                    this.fRP.toggleFilterPane();
+                }.bind(this));
+            }
+        } else if(aName == 'copy_as_text'){
             if(!this.htmlElement.down("#copyAsTextButton")){
                 this.htmlElement.down(".editor_action_bar").insert('' +
                     '<a id="copyAsTextButton" class="icon-copy" title="Copy">' +