diff --git a/packages/builder/src/components/design/settings/controls/CellConditionEditor.svelte b/packages/builder/src/components/design/settings/controls/CellConditionEditor.svelte
index 5f19739f9d..997155fbdf 100644
--- a/packages/builder/src/components/design/settings/controls/CellConditionEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/CellConditionEditor.svelte
@@ -7,6 +7,7 @@
     Layout,
     Select,
     Icon,
+    DatePicker,
   } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { cloneDeep } from "lodash"
@@ -167,13 +168,28 @@
                   placeholder={null}
                   on:change={() => onValueTypeChange(condition)}
                 />
-                <DrawerBindableInput
-                  {bindings}
-                  disabled={condition.noValue}
-                  placeholder="Value"
-                  value={condition.referenceValue}
-                  on:change={e => (condition.referenceValue = e.detail)}
-                />
+                {#if type === FieldType.DATETIME && condition.valueType === type}
+                  <DatePicker
+                    placeholder="Value"
+                    disabled={condition.noValue}
+                    bind:value={condition.referenceValue}
+                  />
+                {:else if type === FieldType.BOOLEAN && condition.valueType === type}
+                  <Select
+                    placeholder="Value"
+                    disabled={condition.noValue}
+                    options={["True", "False"]}
+                    bind:value={condition.referenceValue}
+                  />
+                {:else}
+                  <DrawerBindableInput
+                    {bindings}
+                    placeholder="Value"
+                    disabled={condition.noValue}
+                    value={condition.referenceValue}
+                    on:change={e => (condition.referenceValue = e.detail)}
+                  />
+                {/if}
                 <Icon
                   name="Duplicate"
                   hoverable
diff --git a/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte b/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte
index 2a7d93ded6..b4cf542a74 100644
--- a/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte
+++ b/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte
@@ -175,6 +175,9 @@
   .header :global(.cell) {
     background: var(--grid-background-alt);
   }
+  .header :global(.cell::before) {
+    display: none;
+  }
   .row {
     display: flex;
     flex-direction: row;