diff --git a/src/context-selection/org-unit-selector-bar-item/debounced-search-input.js b/src/context-selection/org-unit-selector-bar-item/debounced-search-input.js
index e40e266c3..974d92e5a 100644
--- a/src/context-selection/org-unit-selector-bar-item/debounced-search-input.js
+++ b/src/context-selection/org-unit-selector-bar-item/debounced-search-input.js
@@ -2,11 +2,11 @@ import i18n from '@dhis2/d2-i18n'
 import { InputField } from '@dhis2/ui'
 import PropTypes from 'prop-types'
 import React, { useEffect, useState } from 'react'
-import useDebounce from './use-debounce.js'
+import { useDebouncedValue } from '../../shared/index.js'
 
 export default function DebouncedSearchInput({ onChange, initialValue }) {
     const [value, setValue] = useState(initialValue)
-    const debouncedValue = useDebounce(value, 200)
+    const debouncedValue = useDebouncedValue(value, 200)
 
     useEffect(() => {
         onChange(debouncedValue)
diff --git a/src/context-selection/org-unit-selector-bar-item/use-debounce.js b/src/context-selection/org-unit-selector-bar-item/use-debounce.js
deleted file mode 100644
index 429e18de8..000000000
--- a/src/context-selection/org-unit-selector-bar-item/use-debounce.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { useEffect, useState } from 'react'
-
-/** Copied from https://usehooks.com/useDebounce/ */
-export default function useDebounce(value, delay) {
-    const [debouncedValue, setDebouncedValue] = useState(value)
-
-    useEffect(() => {
-        const handler = setTimeout(() => setDebouncedValue(value), delay)
-        return () => clearTimeout(handler)
-    }, [value, delay])
-
-    return debouncedValue
-}
diff --git a/src/data-workspace/entry-form.js b/src/data-workspace/entry-form.js
index 76113bdd1..e6dac530e 100644
--- a/src/data-workspace/entry-form.js
+++ b/src/data-workspace/entry-form.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types'
 import React from 'react'
+import { useDebounce } from '../shared/index.js'
 import { FORM_TYPES } from './constants.js'
 import { CustomForm } from './custom-form/index.js'
 import { DefaultForm } from './default-form.js'
@@ -17,6 +18,7 @@ export const EntryForm = ({ dataSet }) => {
     const [globalFilterText, setGlobalFilterText] = React.useState('')
     const formType = dataSet.formType
     const Component = formTypeToComponent[formType]
+    const debouncedSetGlobalFilterText = useDebounce(setGlobalFilterText, 200)
 
     useCloseRightHandPanelOnSelectionChange()
 
@@ -24,8 +26,7 @@ export const EntryForm = ({ dataSet }) => {
         <>
             {formType !== FORM_TYPES.CUSTOM && (
                 <FilterField
-                    value={globalFilterText}
-                    setFilterText={setGlobalFilterText}
+                    onFilterChange={debouncedSetGlobalFilterText}
                     formType={formType}
                 />
             )}
diff --git a/src/data-workspace/filter-field.js b/src/data-workspace/filter-field.js
index f7034ef53..06bf1493e 100644
--- a/src/data-workspace/filter-field.js
+++ b/src/data-workspace/filter-field.js
@@ -2,12 +2,19 @@ import i18n from '@dhis2/d2-i18n'
 import { Button, InputField } from '@dhis2/ui'
 import classNames from 'classnames'
 import PropTypes from 'prop-types'
-import React from 'react'
+import React, { useState } from 'react'
 import { FORM_TYPES } from './constants.js'
 import styles from './entry-form.module.css'
 
-export default function FilterField({ value, setFilterText, formType }) {
+export default function FilterField({ onFilterChange, formType }) {
+    const [filterText, setFilterText] = useState('')
     const wrapperClasses = classNames(styles.filterWrapper, 'hide-for-print')
+
+    const onChange = ({ value }) => {
+        setFilterText(value)
+        onFilterChange(value)
+    }
+
     return (
         <div className={wrapperClasses}>
             <InputField
@@ -19,8 +26,8 @@ export default function FilterField({ value, setFilterText, formType }) {
                         ? i18n.t('Filter fields in all sections')
                         : i18n.t('Filter fields')
                 }
-                value={value}
-                onChange={({ value }) => setFilterText(value)}
+                value={filterText}
+                onChange={onChange}
             />
             <Button
                 secondary
@@ -36,6 +43,5 @@ export default function FilterField({ value, setFilterText, formType }) {
 
 FilterField.propTypes = {
     formType: PropTypes.string,
-    setFilterText: PropTypes.func,
-    value: PropTypes.string,
+    onFilterChange: PropTypes.func,
 }
diff --git a/src/data-workspace/section-form/section-filter.js b/src/data-workspace/section-form/section-filter.js
new file mode 100644
index 000000000..cf5d2254b
--- /dev/null
+++ b/src/data-workspace/section-form/section-filter.js
@@ -0,0 +1,33 @@
+import i18n from '@dhis2/d2-i18n'
+import { colors, IconFilter16 } from '@dhis2/ui'
+import PropTypes from 'prop-types'
+import React, { useState } from 'react'
+import styles from './section.module.css'
+
+export const SectionFilter = ({ id, onFilterChange }) => {
+    const [filterText, setFilterText] = useState('')
+    const onChange = ({ target }) => {
+        setFilterText(target.value)
+        onFilterChange(filterText)
+    }
+
+    return (
+        <label htmlFor={id} className={styles.filterWrapper}>
+            <IconFilter16 color={colors.grey600} />
+            <input
+                name={id}
+                id={id}
+                type="text"
+                placeholder={i18n.t('Type here to filter in this section')}
+                value={filterText}
+                onChange={onChange}
+                className={styles.filterInput}
+            />
+        </label>
+    )
+}
+
+SectionFilter.propTypes = {
+    id: PropTypes.string,
+    onFilterChange: PropTypes.func,
+}
diff --git a/src/data-workspace/section-form/section.js b/src/data-workspace/section-form/section.js
index 6f71ad364..25366b3e2 100644
--- a/src/data-workspace/section-form/section.js
+++ b/src/data-workspace/section-form/section.js
@@ -1,18 +1,12 @@
-import i18n from '@dhis2/d2-i18n'
-import {
-    colors,
-    IconFilter16,
-    Table,
-    TableCellHead,
-    TableHead,
-    TableRowHead,
-} from '@dhis2/ui'
+import { Table, TableCellHead, TableHead, TableRowHead } from '@dhis2/ui'
 import classNames from 'classnames'
 import PropTypes from 'prop-types'
 import React, { useState } from 'react'
 import { useMetadata, selectors } from '../../metadata/index.js'
+import { useDebounce } from '../../shared/index.js'
 import { CategoryComboTable } from '../category-combo-table/index.js'
 import { getFieldId } from '../get-field-id.js'
+import { SectionFilter } from './section-filter.js'
 import styles from './section.module.css'
 
 export const SectionFormSection = ({
@@ -22,6 +16,7 @@ export const SectionFormSection = ({
 }) => {
     // Could potentially build table via props instead of rendering children
     const [filterText, setFilterText] = useState('')
+    const debouncedSetFilterText = useDebounce(setFilterText, 200)
     const { data } = useMetadata()
 
     if (!data) {
@@ -75,25 +70,10 @@ export const SectionFormSection = ({
                 </TableRowHead>
                 <TableRowHead>
                     <TableCellHead colSpan="100%" className={headerCellStyles}>
-                        <label
-                            htmlFor={filterInputId}
-                            className={styles.filterWrapper}
-                        >
-                            <IconFilter16 color={colors.grey600} />
-                            <input
-                                name={filterInputId}
-                                id={filterInputId}
-                                type="text"
-                                placeholder={i18n.t(
-                                    'Type here to filter in this section'
-                                )}
-                                value={filterText}
-                                onChange={({ target }) =>
-                                    setFilterText(target.value)
-                                }
-                                className={styles.filterInput}
-                            />
-                        </label>
+                        <SectionFilter
+                            id={filterInputId}
+                            onFilterChange={debouncedSetFilterText}
+                        />
                     </TableCellHead>
                 </TableRowHead>
             </TableHead>
diff --git a/src/shared/index.js b/src/shared/index.js
index d708d50a1..6e4132311 100644
--- a/src/shared/index.js
+++ b/src/shared/index.js
@@ -5,3 +5,4 @@ export * from './fixed-periods/index.js'
 export * from './period/index.js'
 export * from './sidebar/index.js'
 export * from './utils.js'
+export * from './use-debounce.js'
diff --git a/src/shared/use-debounce.js b/src/shared/use-debounce.js
new file mode 100644
index 000000000..64eb6e0f1
--- /dev/null
+++ b/src/shared/use-debounce.js
@@ -0,0 +1,29 @@
+import { useCallback, useEffect, useRef, useState } from 'react'
+
+/** Copied from https://usehooks.com/useDebounce/ */
+export function useDebouncedValue(value, delay) {
+    const [debouncedValue, setDebouncedValue] = useState(value)
+
+    useEffect(() => {
+        const handler = setTimeout(() => setDebouncedValue(value), delay)
+        return () => clearTimeout(handler)
+    }, [value, delay])
+
+    return debouncedValue
+}
+
+/*
+ * If this component ever causes issues,
+ * consider using https://github.com/xnimorz/use-debounce
+ */
+export function useDebounce(callback, delay) {
+    const timeoutIdRef = useRef(null)
+
+    return useCallback(
+        (...args) => {
+            clearTimeout(timeoutIdRef.current)
+            timeoutIdRef.current = setTimeout(() => callback(...args), delay)
+        },
+        [callback, delay]
+    )
+}