diff --git a/src/components/DataEntry/DataEntryTable/RecentEntryCold.tsx b/src/components/DataEntry/DataEntryTable/RecentEntryCold.tsx
new file mode 100644
index 0000000000..a3657dd667
--- /dev/null
+++ b/src/components/DataEntry/DataEntryTable/RecentEntryCold.tsx
@@ -0,0 +1,74 @@
+import { Edit } from "@mui/icons-material";
+import { Grid2 } from "@mui/material";
+import { ReactElement, memo } from "react";
+
+import { Word, WritingSystem } from "api/models";
+import { NoteButton } from "components/Buttons";
+import { AudioSummary } from "components/WordCard";
+import theme from "types/theme";
+import { TypographyWithFont } from "utilities/fontComponents";
+import { firstGlossText } from "utilities/wordUtilities";
+
+const idAffix = "recent-entry";
+
+export interface RecentEntryColdProps {
+  analysisLang: WritingSystem;
+  entry: Word;
+  rowIndex: number;
+  senseGuid: string;
+}
+
+/** Displays a recently entered word that a user cannot edit. */
+export function RecentEntryCold(props: RecentEntryColdProps): ReactElement {
+  const sense = props.entry.senses.find((s) => s.guid === props.senseGuid);
+  const gloss = sense ? firstGlossText(sense, props.analysisLang.bcp47) : "";
+
+  return (
+    <Grid2 alignItems="center" container id={`${idAffix}-${props.rowIndex}`}>
+      <Grid2
+        size={4}
+        style={{ paddingInline: theme.spacing(2), position: "relative" }}
+      >
+        <TypographyWithFont vernacular>
+          {props.entry.vernacular}
+        </TypographyWithFont>
+      </Grid2>
+
+      <Grid2
+        size={4}
+        style={{ paddingInline: theme.spacing(2), position: "relative" }}
+      >
+        <TypographyWithFont analysis lang={props.analysisLang.bcp47}>
+          {gloss}
+        </TypographyWithFont>
+      </Grid2>
+
+      <Grid2
+        size={1}
+        style={{ paddingInline: theme.spacing(1), position: "relative" }}
+      >
+        {props.entry.note.text ? (
+          <NoteButton disabled noteText={props.entry.note.text} />
+        ) : null}
+      </Grid2>
+
+      <Grid2
+        size={1}
+        style={{ paddingInline: theme.spacing(1), position: "relative" }}
+      >
+        <AudioSummary count={props.entry.audio.length} />
+      </Grid2>
+
+      <Grid2 size={1} />
+
+      <Grid2
+        size={1}
+        style={{ paddingInline: theme.spacing(1), position: "relative" }}
+      >
+        <Edit />
+      </Grid2>
+    </Grid2>
+  );
+}
+
+export default memo(RecentEntryCold);
diff --git a/src/components/DataEntry/DataEntryTable/RecentEntryHot.tsx b/src/components/DataEntry/DataEntryTable/RecentEntryHot.tsx
new file mode 100644
index 0000000000..2fcff083db
--- /dev/null
+++ b/src/components/DataEntry/DataEntryTable/RecentEntryHot.tsx
@@ -0,0 +1,182 @@
+import { Check } from "@mui/icons-material";
+import { Grid2, IconButton } from "@mui/material";
+import { ReactElement, memo, useState } from "react";
+
+import { Pronunciation, Word, WritingSystem } from "api/models";
+import { NoteButton } from "components/Buttons";
+import {
+  DeleteEntry,
+  GlossWithSuggestions,
+  VernWithSuggestions,
+} from "components/DataEntry/DataEntryTable/EntryCellComponents";
+import PronunciationsBackend from "components/Pronunciations/PronunciationsBackend";
+import theme from "types/theme";
+import { FileWithSpeakerId, newGloss } from "types/word";
+import { firstGlossText } from "utilities/wordUtilities";
+
+const idAffix = "recent-entry";
+
+export interface RecentEntryHotProps {
+  rowIndex: number;
+  entry: Word;
+  senseGuid: string;
+  updateGloss: (index: number, gloss: string) => void;
+  updateNote: (index: number, newText: string) => Promise<void>;
+  updateVern: (index: number, newVern: string, targetWordId?: string) => void;
+  removeEntry: (index: number) => void;
+  addAudioToWord: (wordId: string, file: FileWithSpeakerId) => void;
+  delAudioFromWord: (wordId: string, fileName: string) => void;
+  repAudioInWord: (wordId: string, audio: Pronunciation) => void;
+  focusNewEntry: () => void;
+  analysisLang: WritingSystem;
+  vernacularLang: WritingSystem;
+  disabled?: boolean;
+  close: () => void;
+}
+
+/**
+ * Displays a recently entered word that a user can still edit
+ */
+export function RecentEntryHot(props: RecentEntryHotProps): ReactElement {
+  const sense = props.entry.senses.find((s) => s.guid === props.senseGuid)!;
+  if (sense.glosses.length < 1) {
+    sense.glosses.push(newGloss("", props.analysisLang.bcp47));
+  }
+  const [editing, setEditing] = useState(false);
+  const [gloss, setGloss] = useState(
+    firstGlossText(sense, props.analysisLang.bcp47)
+  );
+  const [vernacular, setVernacular] = useState(props.entry.vernacular);
+
+  const updateGlossField = (gloss: string): void => {
+    setEditing(gloss !== firstGlossText(sense, props.analysisLang.bcp47));
+    setGloss(gloss);
+  };
+  const updateVernField = (vern: string): void => {
+    setEditing(vern !== props.entry.vernacular);
+    setVernacular(vern);
+  };
+
+  function conditionallyUpdateGloss(): void {
+    if (firstGlossText(sense, props.analysisLang.bcp47) !== gloss) {
+      props.updateGloss(props.rowIndex, gloss);
+      props.close();
+    }
+  }
+
+  function conditionallyUpdateVern(): void {
+    if (vernacular.trim()) {
+      if (props.entry.vernacular !== vernacular) {
+        props.updateVern(props.rowIndex, vernacular);
+        props.close();
+      }
+    } else {
+      setVernacular(props.entry.vernacular);
+    }
+  }
+
+  const handleRemoveEntry = (): void => props.removeEntry(props.rowIndex);
+  const handleUpdateNote = async (noteText: string): Promise<void> => {
+    await props.updateNote(props.rowIndex, noteText);
+    props.close();
+  };
+
+  return (
+    <Grid2
+      alignItems="center"
+      container
+      id={`${idAffix}-${props.rowIndex}`}
+      rowSpacing={1}
+    >
+      <Grid2
+        size={11}
+        style={{ paddingInline: theme.spacing(2), position: "relative" }}
+      >
+        <VernWithSuggestions
+          vernacular={vernacular}
+          isNew
+          isDisabled={props.disabled || props.entry.senses.length > 1}
+          updateVernField={updateVernField}
+          onBlur={() => conditionallyUpdateVern()}
+          handleEnter={() => {
+            vernacular && props.focusNewEntry();
+          }}
+          vernacularLang={props.vernacularLang}
+          textFieldId={`${idAffix}-${props.rowIndex}-vernacular`}
+        />
+      </Grid2>
+
+      <Grid2 size={1}>
+        <IconButton onClick={props.close}>
+          <Check sx={{ color: (t) => t.palette.success.main }} />
+        </IconButton>
+      </Grid2>
+
+      <Grid2
+        size={11}
+        style={{ paddingInline: theme.spacing(2), position: "relative" }}
+      >
+        <GlossWithSuggestions
+          gloss={gloss}
+          isDisabled={props.disabled}
+          isNew
+          updateGlossField={updateGlossField}
+          onBlur={() => conditionallyUpdateGloss()}
+          handleEnter={() => {
+            gloss && props.focusNewEntry();
+          }}
+          analysisLang={props.analysisLang}
+          textFieldId={`${idAffix}-${props.rowIndex}-gloss`}
+        />
+      </Grid2>
+
+      <Grid2 size={1} />
+
+      <Grid2
+        size={2}
+        style={{ paddingInline: theme.spacing(1), position: "relative" }}
+      >
+        <NoteButton
+          disabled={editing || props.disabled}
+          noteText={props.entry.note.text}
+          updateNote={handleUpdateNote}
+          buttonId={`${idAffix}-${props.rowIndex}-note`}
+        />
+      </Grid2>
+
+      <Grid2
+        size={8}
+        style={{ paddingInline: theme.spacing(1), position: "relative" }}
+      >
+        <PronunciationsBackend
+          audio={props.entry.audio}
+          disabled={editing || props.disabled}
+          wordId={props.entry.id}
+          deleteAudio={(fileName) => {
+            props.delAudioFromWord(props.entry.id, fileName);
+          }}
+          replaceAudio={(audio) => props.repAudioInWord(props.entry.id, audio)}
+          uploadAudio={(file) => {
+            props.addAudioToWord(props.entry.id, file);
+          }}
+        />
+      </Grid2>
+
+      <Grid2 size={1} />
+
+      <Grid2
+        size={1}
+        style={{ paddingInline: theme.spacing(1), position: "relative" }}
+      >
+        <DeleteEntry
+          removeEntry={handleRemoveEntry}
+          buttonId={`${idAffix}-${props.rowIndex}-delete`}
+          confirmId={"addWords.deleteRowWarning"}
+          disabled={editing || props.disabled}
+        />
+      </Grid2>
+    </Grid2>
+  );
+}
+
+export default memo(RecentEntryHot);
diff --git a/src/components/DataEntry/DataEntryTable/index.tsx b/src/components/DataEntry/DataEntryTable/index.tsx
index 0a119b4c50..3ad99501b5 100644
--- a/src/components/DataEntry/DataEntryTable/index.tsx
+++ b/src/components/DataEntry/DataEntryTable/index.tsx
@@ -1,9 +1,8 @@
 import { ExitToApp, List as ListIcon } from "@mui/icons-material";
-import { Button, Grid, Typography } from "@mui/material";
+import { Button, Grid2, Typography } from "@mui/material";
 import { enqueueSnackbar } from "notistack";
 import {
   FormEvent,
-  Fragment,
   ReactElement,
   useCallback,
   useContext,
@@ -27,7 +26,8 @@ import {
 import * as backend from "backend";
 import { getCurrentUser, getUserId } from "backend/localStorage";
 import NewEntry from "components/DataEntry/DataEntryTable/NewEntry";
-import RecentEntry from "components/DataEntry/DataEntryTable/RecentEntry";
+import RecentEntryCold from "components/DataEntry/DataEntryTable/RecentEntryCold";
+import RecentEntryHot from "components/DataEntry/DataEntryTable/RecentEntryHot";
 import {
   filterWordsWithSenses,
   focusInput,
@@ -36,7 +36,6 @@ import { uploadFileFromPronunciation } from "components/Pronunciations/utilities
 import { useAppSelector } from "rootRedux/hooks";
 import { type StoreState } from "rootRedux/types";
 import { type Hash } from "types/hash";
-import theme from "types/theme";
 import {
   FileWithSpeakerId,
   newGloss,
@@ -215,6 +214,7 @@ const defaultNewEntryState = (): NewEntryState => ({
 interface EntryTableState extends NewEntryState {
   defunctUpdates: Hash<string>;
   defunctWordIds: Hash<DefunctStatus>;
+  recentWordEditingIndex: number | undefined;
   recentWords: WordAccess[];
   senseSwitches: SenseSwitch[];
 }
@@ -223,6 +223,7 @@ const defaultEntryTableState = (): EntryTableState => ({
   ...defaultNewEntryState(),
   defunctUpdates: {},
   defunctWordIds: {},
+  recentWordEditingIndex: undefined,
   recentWords: [],
   senseSwitches: [],
 });
@@ -1017,61 +1018,71 @@ export default function DataEntryTable(
 
   return (
     <form onSubmit={(e?: FormEvent<HTMLFormElement>) => e?.preventDefault()}>
-      <input type="submit" style={{ display: "none" }} />
-      <Grid container>
-        <Grid item xs={4}>
-          <Typography
-            variant="h5"
-            align="center"
-            style={{
-              marginTop: theme.spacing(2),
-              marginBottom: theme.spacing(2),
-            }}
-          >
+      <Grid2 container rowSpacing={1}>
+        <Grid2 size={4}>
+          <Typography align="center" variant="h5">
             {t("addWords.vernacular")}
           </Typography>
-        </Grid>
-        <Grid item xs={4}>
-          <Typography
-            variant="h5"
-            align="center"
-            style={{
-              marginTop: theme.spacing(2),
-              marginBottom: theme.spacing(2),
-            }}
-          >
+        </Grid2>
+
+        <Grid2 size={4}>
+          <Typography align="center" variant="h5">
             {t("addWords.glosses")}
           </Typography>
-        </Grid>
+        </Grid2>
 
         {state.recentWords.map((wordAccess, index) => (
-          <Grid
-            item
+          <Grid2
             key={`${wordAccess.word.id}_${wordAccess.senseGuid}`}
-            xs={12}
+            size={12}
+            sx={{ borderBottom: "1px solid #eee" }}
           >
-            <RecentEntry
-              rowIndex={index}
-              entry={wordAccess.word}
-              senseGuid={wordAccess.senseGuid}
-              updateGloss={updateRecentGloss}
-              updateNote={updateRecentNote}
-              updateVern={updateRecentVern}
-              removeEntry={undoRecentEntry}
-              addAudioToWord={addAudioFileToWord}
-              delAudioFromWord={deleteAudioFromWord}
-              repAudioInWord={replaceAudioInWord}
-              focusNewEntry={handleFocusNewEntry}
-              analysisLang={analysisLang}
-              vernacularLang={vernacularLang}
-              disabled={Object.keys(state.defunctWordIds).includes(
-                wordAccess.word.id
-              )}
-            />
-          </Grid>
+            {index === state.recentWordEditingIndex ? (
+              <RecentEntryHot
+                rowIndex={index}
+                entry={wordAccess.word}
+                senseGuid={wordAccess.senseGuid}
+                updateGloss={updateRecentGloss}
+                updateNote={updateRecentNote}
+                updateVern={updateRecentVern}
+                removeEntry={undoRecentEntry}
+                addAudioToWord={addAudioFileToWord}
+                delAudioFromWord={deleteAudioFromWord}
+                repAudioInWord={replaceAudioInWord}
+                focusNewEntry={handleFocusNewEntry}
+                analysisLang={analysisLang}
+                vernacularLang={vernacularLang}
+                disabled={Object.keys(state.defunctWordIds).includes(
+                  wordAccess.word.id
+                )}
+                close={() =>
+                  setState((prev) => ({
+                    ...prev,
+                    recentWordEditingIndex: undefined,
+                  }))
+                }
+              />
+            ) : (
+              <div
+                onClick={() =>
+                  setState((prev) => ({
+                    ...prev,
+                    recentWordEditingIndex: index,
+                  }))
+                }
+              >
+                <RecentEntryCold
+                  analysisLang={analysisLang}
+                  entry={wordAccess.word}
+                  rowIndex={index}
+                  senseGuid={wordAccess.senseGuid}
+                />
+              </div>
+            )}
+          </Grid2>
         ))}
 
-        <Grid item xs={12}>
+        <Grid2 size={12}>
           <NewEntry
             analysisLang={analysisLang}
             vernacularLang={vernacularLang}
@@ -1097,38 +1108,29 @@ export default function DataEntryTable(
             suggestedDups={state.suggestedDups}
             suggestedVerns={state.suggestedVerns}
           />
-        </Grid>
-      </Grid>
+        </Grid2>
 
-      <Grid container justifyContent="space-between" spacing={3}>
-        <Grid item>
+        <Grid2 container justifyContent="space-between" size={12}>
           {props.hasDrawerButton ? (
-            <Button
-              id="toggle-existing-data"
-              style={{ marginTop: theme.spacing(2) }}
-              onClick={props.showExistingData}
-            >
-              <ListIcon fontSize={"medium"} color={"inherit"} />
+            <Button id="toggle-existing-data" onClick={props.showExistingData}>
+              <ListIcon />
             </Button>
           ) : (
-            <Fragment />
+            <div />
           )}
-        </Grid>
-        <Grid item>
+
           <Button
             id={exitButtonId}
-            type="submit"
             variant="contained"
             color={highlightExitButton ? "primary" : "secondary"}
-            style={{ marginTop: theme.spacing(2) }}
             endIcon={<ExitToApp />}
             tabIndex={-1}
             onClick={handleExit}
           >
             {t("buttons.exit")}
           </Button>
-        </Grid>
-      </Grid>
+        </Grid2>
+      </Grid2>
     </form>
   );
 }