diff --git a/GxColumns.bbj b/GxColumns.bbj
index 99070280..e622c9b8 100644
--- a/GxColumns.bbj
+++ b/GxColumns.bbj
@@ -223,6 +223,13 @@ class public GxDefaultColumnDefinition extends GxColumnDefinition
     rem  */
     field public BBjNumber EnableFilter! = 1
     rem /**
+    rem  * When true enable the floating filter on this column , false otherwise 
+    rem  *
+    rem  * <br><b><small>#Configuration</small></b>
+    rem  * <br><b><small>#ColumnsRenderer</small></b>
+    rem  */
+    field public BBjNumber FloatingFilter! = null()
+    rem /**
     rem  * Set to true to make a column hidden by default&#183;
     rem  *
     rem  * <br><b><small>#Configuration</small></b>
@@ -1074,6 +1081,7 @@ class public GxDefaultColumnDefinition extends GxColumnDefinition
         column!.addProperty("tooltipField",#getTooltipField(),err=*next)
         column!.addProperty("tooltipValueGetter",#getTooltipValueGetterExpression().toString(),err=*next)
         column!.addProperty("editable",#getEditable().booleanValue(),err=*next)
+        column!.addProperty("floatingFilter",#getFloatingFilter().booleanValue(),err=*next)
         editableExpression! = #getEditableExpression()
 
         if(editableExpression! <> null()) then
diff --git a/GxOptions.bbj b/GxOptions.bbj
index def89df2..79dc4312 100644
--- a/GxOptions.bbj
+++ b/GxOptions.bbj
@@ -785,8 +785,11 @@ class public GxOptions
     field public BBjNumber SuppressTouch! = null()
     rem /**
     rem  * When true enables the floating filters, disable otherwise
+    rem  * 
     rem  * <br><b><small>#Configuration</small></b>
     rem  * <br><b><small>#GridRenderer</small></b>
+    rem  * 
+    rem  * @deprecated enabling/disabling the floatingFilter on the Options level is deprecated. Use `GxColumn.FloatingFilter` on the column level instead.
     rem  */
     field public BBjNumber EnableFloatingFilter! = 0
     rem /**
diff --git a/demo/Datatypes.bbj b/demo/Datatypes.bbj
index 8d6a8db4..a0f11ce0 100644
--- a/demo/Datatypes.bbj
+++ b/demo/Datatypes.bbj
@@ -25,7 +25,7 @@ wnd!        .setCallback(BBjAPI.ON_RESIZE,"resize")
 REM init the grid
 grid! = new BBjGridExWidget(wnd!,100,0,0,800,600)
 grid!.getOptions().setEnableFilter(1)
-grid!.getOptions().setEnableFloatingFilter(1)
+grid!.getOptions().getDefaultColumnDefinition().setFloatingFilter(1)
 
 
 rem /**
diff --git a/demo/Editing.bbj b/demo/Editing.bbj
index 442936bc..489879fc 100644
--- a/demo/Editing.bbj
+++ b/demo/Editing.bbj
@@ -38,7 +38,7 @@ wnd!.setCallback(BBjAPI.ON_RESIZE,"resize")
 
 grid! = new BBjGridExWidget(wnd!,100,10,50,1430,550)
 grid!.getOptions().setEnableFilter(1)
-grid!.getOptions().setEnableFloatingFilter(1)
+grid!.getOptions().getDefaultColumnDefinition().setFloatingFilter(1)
 
 rem enable grid editing based on EDITABLE flag in DataRow Attribute
 grid!.getOptions().setEditable(1)