diff --git a/app/javascript/components/localization/glossary-entries/list/ProposeTermModal.tsx b/app/javascript/components/localization/glossary-entries/list/ProposeTermModal.tsx
new file mode 100644
index 0000000000..df875cc125
--- /dev/null
+++ b/app/javascript/components/localization/glossary-entries/list/ProposeTermModal.tsx
@@ -0,0 +1,143 @@
+import React from 'react'
+import { Modal } from '@/components/modals'
+import { sendRequest } from '@/utils/send-request'
+import { useContext, useState, useCallback } from 'react'
+import toast from 'react-hot-toast'
+import { GlossaryEntriesListContext } from '.'
+import { LocaleSelect } from './LocaleSelect'
+
+export function ProposeTermModal({
+  isOpen,
+  onClose,
+}: {
+  isOpen: boolean
+  onClose: () => void
+}) {
+  const { links, translationLocales } = useContext(GlossaryEntriesListContext)
+  const [term, setTerm] = useState<string>('')
+  const [description, setDescription] = useState<string>('')
+  const [locale, setLocale] = useState<string>(translationLocales[0])
+  const [translation, setTranslation] = useState<string>('')
+
+  const onSave = useCallback(() => {
+    const fetch = sendRequest({
+      endpoint: links.createGlossaryEntry,
+      method: 'POST',
+      body: JSON.stringify({
+        glossary_entry: {
+          term,
+          llm_instructions: description,
+          locale,
+          translation,
+        },
+      }),
+    })
+
+    fetch.fetch
+      .then(() => {
+        onClose()
+        toast.success('Proposed a new term successfully!')
+      })
+      .catch((e) => {
+        toast.error('Failed to propose a new term.', e)
+        console.error(e)
+      })
+  }, [term, description, locale, translation])
+
+  return (
+    <Modal open={isOpen} onClose={onClose}>
+      <div className="w-[400px]">
+        <h2 className="text-h2 font-bold mb-16">Propose New Term</h2>
+        <div className="gap-16 flex flex-col">
+          <div>
+            <label className="block font-semibold mb-4 text-h6" htmlFor="term">
+              Term
+            </label>
+            <input
+              type="text"
+              id="term"
+              value={term}
+              onChange={(e) => setTerm(e.target.value)}
+              className="w-full border border-gray-300 rounded px-12 py-8 mb-8"
+              placeholder="Enter term"
+            />
+
+            <p className="text-p text-textColor6 leading-130">
+              A glossary term is a word or phrase that has a specific meaning
+              within a particular context or field.
+            </p>
+          </div>
+          <div>
+            <label
+              className="block font-semibold mb-4 text-h6"
+              htmlFor="description"
+            >
+              Description
+            </label>
+            <textarea
+              id="description"
+              rows={4}
+              value={description}
+              onChange={(e) => setDescription(e.target.value)}
+              className="w-full border border-gray-300 rounded px-12 py-8 mb-8"
+              placeholder="Enter description"
+            ></textarea>
+            <p className="text-p text-textColor6 leading-130">
+              A glossary term description provides additional context or
+              explanation about the term, helping users understand its usage and
+              significance.
+            </p>
+          </div>
+          <div>
+            <label className="block font-semibold mb-4 text-h6">Locale</label>
+            <LocaleSelect
+              locales={[...(translationLocales || [])]}
+              value={locale}
+              onChange={(locale) => setLocale(locale)}
+              showAll={false}
+              label="Select locale"
+            />
+            <p className="text-p text-textColor6 leading-130 mt-8">
+              Select the language locale for this glossary term.
+            </p>
+          </div>
+          <div>
+            <label
+              className="block font-semibold mb-4 text-h6"
+              htmlFor="translation"
+            >
+              Translation
+            </label>
+            <input
+              type="text"
+              id="translation"
+              value={translation}
+              onChange={(e) => setTranslation(e.target.value)}
+              className="w-full border border-gray-300 rounded px-12 py-8 mb-8"
+              placeholder="Enter translation"
+            />
+            <p className="text-p text-textColor6 leading-130">
+              Provide the translated term or phrase in the selected locale.
+            </p>
+          </div>
+          <div className="flex items-center gap-8">
+            <button
+              onClick={onSave}
+              type="submit"
+              className="btn btn-primary btn-m"
+            >
+              Save
+            </button>
+            <button
+              type="button"
+              className="btn btn-secondary btn-m"
+              onClick={onClose}
+            >
+              Cancel
+            </button>
+          </div>
+        </div>
+      </div>
+    </Modal>
+  )
+}
diff --git a/app/javascript/components/localization/glossary-entries/list/Table.tsx b/app/javascript/components/localization/glossary-entries/list/Table.tsx
index 378e5903e8..7593edc507 100644
--- a/app/javascript/components/localization/glossary-entries/list/Table.tsx
+++ b/app/javascript/components/localization/glossary-entries/list/Table.tsx
@@ -4,13 +4,12 @@ import React, { useCallback, useContext, useEffect, useState } from 'react'
 import { GlossaryEntriesListContext } from '.'
 import { GlossaryEntriesTableList } from './GlossaryEntriesTableList'
 import { Tabs } from './Tabs'
-import { Modal } from '@/components/modals'
-import { sendRequest } from '@/utils/send-request'
-import { Toaster, toast } from 'react-hot-toast'
+import { Toaster } from 'react-hot-toast'
 import { LocaleSelect } from './LocaleSelect'
+import { ProposeTermModal } from './ProposeTermModal'
 
 export function Table() {
-  const { setCriteria, request, translationLocales, setQuery } =
+  const { setCriteria, request, translationLocales, setQuery, setPage } =
     React.useContext(GlossaryEntriesListContext)
 
   const [isOpen, setIsOpen] = React.useState(false)
@@ -25,6 +24,7 @@ export function Table() {
 
   useEffect(() => {
     setCriteria(debouncedValue)
+    setPage(0)
   }, [debouncedValue, setCriteria])
 
   return (
@@ -85,139 +85,3 @@ function ProposeTermButton({ onClick }) {
     </button>
   )
 }
-
-function ProposeTermModal({
-  isOpen,
-  onClose,
-}: {
-  isOpen: boolean
-  onClose: () => void
-}) {
-  const { links, translationLocales } = useContext(GlossaryEntriesListContext)
-  const [term, setTerm] = useState<string>('')
-  const [description, setDescription] = useState<string>('')
-  const [locale, setLocale] = useState<string>(translationLocales[0])
-  const [translation, setTranslation] = useState<string>('')
-
-  const onSave = useCallback(() => {
-    const fetch = sendRequest({
-      endpoint: links.createGlossaryEntry,
-      method: 'POST',
-      body: JSON.stringify({
-        glossary_entry: {
-          term,
-          llm_instructions: description,
-          locale,
-          translation,
-        },
-      }),
-    })
-
-    fetch.fetch
-      .then(() => {
-        onClose()
-        toast.success('Proposed a new term successfully!')
-      })
-      .catch((e) => {
-        toast.error('Failed to propose a new term.', e)
-        console.error(e)
-      })
-  }, [term, description, locale, translation])
-
-  return (
-    <Modal open={isOpen} onClose={onClose}>
-      <div className="w-[400px]">
-        <h2 className="text-h2 font-bold mb-16">Propose New Term</h2>
-        <div className="gap-16 flex flex-col">
-          <div>
-            <label className="block font-semibold mb-4 text-h6" htmlFor="term">
-              Term
-            </label>
-            <input
-              type="text"
-              id="term"
-              value={term}
-              onChange={(e) => setTerm(e.target.value)}
-              className="w-full border border-gray-300 rounded px-12 py-8 mb-8"
-              placeholder="Enter term"
-            />
-
-            <p className="text-p text-textColor6 leading-130">
-              A glossary term is a word or phrase that has a specific meaning
-              within a particular context or field.
-            </p>
-          </div>
-          <div>
-            <label
-              className="block font-semibold mb-4 text-h6"
-              htmlFor="description"
-            >
-              Description
-            </label>
-            <textarea
-              id="description"
-              rows={4}
-              value={description}
-              onChange={(e) => setDescription(e.target.value)}
-              className="w-full border border-gray-300 rounded px-12 py-8 mb-8"
-              placeholder="Enter description"
-            ></textarea>
-            <p className="text-p text-textColor6 leading-130">
-              A glossary term description provides additional context or
-              explanation about the term, helping users understand its usage and
-              significance.
-            </p>
-          </div>
-          <div>
-            <label className="block font-semibold mb-4 text-h6">Locale</label>
-            <LocaleSelect
-              locales={[...(translationLocales || [])]}
-              value={locale}
-              onChange={(locale) => setLocale(locale)}
-              showAll={false}
-              label="Select locale"
-            />
-            <p className="text-p text-textColor6 leading-130 mt-8">
-              Select the language locale for this glossary term.
-            </p>
-          </div>
-          <div>
-            <label
-              className="block font-semibold mb-4 text-h6"
-              htmlFor="translation"
-            >
-              Translation
-            </label>
-            <input
-              type="text"
-              id="translation"
-              value={translation}
-              onChange={(e) => setTranslation(e.target.value)}
-              className="w-full border border-gray-300 rounded px-12 py-8 mb-8"
-              placeholder="Enter translation"
-            />
-            <p className="text-p text-textColor6 leading-130">
-              Provide the translated term or phrase in the selected locale.
-            </p>
-          </div>
-          <div className="flex items-center gap-8">
-            <button
-              onClick={onSave}
-              type="submit"
-              className="btn btn-primary btn-m"
-            >
-              Save
-            </button>
-            <button
-              type="button"
-              className="btn btn-secondary btn-m"
-              onClick={onClose}
-            >
-              Cancel
-            </button>
-          </div>
-        </div>
-      </div>
-    </Modal>
-  )
-}