diff --git a/package-lock.json b/package-lock.json
index 1d852aa8..882c9da7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "idb-keyval": "^6.2.0",
         "mathjax": "^3.2.2",
         "mathjs": "^11.8.2",
-        "mathlive": "github:mgreminger/mathlive#29b14918088a7f0ad9f8204f982447a7dbc6c8df",
+        "mathlive": "github:mgreminger/mathlive#bbe2b44a1f84f4107784a2f92beda30bc62411f1",
         "plotly.js-basic-dist": "github:mgreminger/plotly.js#dist-basic-for-ep",
         "quick-lru": "^6.1.1",
         "quill": "^1.3.7",
@@ -5274,8 +5274,8 @@
     },
     "node_modules/mathlive": {
       "version": "0.98.6",
-      "resolved": "git+ssh://git@github.com/mgreminger/mathlive.git#29b14918088a7f0ad9f8204f982447a7dbc6c8df",
-      "integrity": "sha512-TWC1iRy9bi9VQPk/5eRAPwm39SvvETm01KAY/wj+Nnzf7agSUbclRMRI530Mc3Gaz2ehbNZEzVmIsVhJQk/aZg==",
+      "resolved": "git+ssh://git@github.com/mgreminger/mathlive.git#bbe2b44a1f84f4107784a2f92beda30bc62411f1",
+      "integrity": "sha512-6frGRbwga8Q6/HLf9tGUQtUBwwzifTB1B/4TbAy2ahzUI26MMsQMunldVPcOaF6sc2GMhP4lVzSU0T72IEa7aQ==",
       "license": "MIT",
       "dependencies": {
         "@cortex-js/compute-engine": "0.23.1"
@@ -11720,9 +11720,9 @@
       }
     },
     "mathlive": {
-      "version": "git+ssh://git@github.com/mgreminger/mathlive.git#29b14918088a7f0ad9f8204f982447a7dbc6c8df",
-      "integrity": "sha512-TWC1iRy9bi9VQPk/5eRAPwm39SvvETm01KAY/wj+Nnzf7agSUbclRMRI530Mc3Gaz2ehbNZEzVmIsVhJQk/aZg==",
-      "from": "mathlive@github:mgreminger/mathlive#29b14918088a7f0ad9f8204f982447a7dbc6c8df",
+      "version": "git+ssh://git@github.com/mgreminger/mathlive.git#bbe2b44a1f84f4107784a2f92beda30bc62411f1",
+      "integrity": "sha512-6frGRbwga8Q6/HLf9tGUQtUBwwzifTB1B/4TbAy2ahzUI26MMsQMunldVPcOaF6sc2GMhP4lVzSU0T72IEa7aQ==",
+      "from": "mathlive@github:mgreminger/mathlive#bbe2b44a1f84f4107784a2f92beda30bc62411f1",
       "requires": {
         "@cortex-js/compute-engine": "0.23.1"
       }
diff --git a/package.json b/package.json
index a6c4608e..fd1f57f5 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "idb-keyval": "^6.2.0",
     "mathjax": "^3.2.2",
     "mathjs": "^11.8.2",
-    "mathlive": "github:mgreminger/mathlive#29b14918088a7f0ad9f8204f982447a7dbc6c8df",
+    "mathlive": "github:mgreminger/mathlive#bbe2b44a1f84f4107784a2f92beda30bc62411f1",
     "plotly.js-basic-dist": "github:mgreminger/plotly.js#dist-basic-for-ep",
     "quick-lru": "^6.1.1",
     "quill": "^1.3.7",
diff --git a/src/App.svelte b/src/App.svelte
index 04804390..eedfe96e 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -7,7 +7,7 @@
   import PlotCell from "./cells/PlotCell";
   import PiecewiseCell from "./cells/PiecewiseCell";
   import SystemCell from "./cells/SystemCell";
-  import { cells, title, results, system_results, history, insertedSheets, activeCell, 
+  import { cells, title, results, resultsInvalid, system_results, history, insertedSheets, activeCell, 
            getSheetJson, getSheetObject, resetSheet, sheetId, mathCellChanged, nonMathCellChanged,
            addCell, prefersReducedMotion, modifierKey, inCellInsertMode, config, unsavedChange,
            incrementActiveCell, decrementActiveCell, deleteCell, activeMathField,
@@ -90,7 +90,7 @@
 
   const apiUrl = window.location.origin;
 
-  const currentVersion = 20240418;
+  const currentVersion = 20240513;
   const tutorialHash = "fFjTsnFoSQMLwcvteVoNtL";
 
   const termsVersion = 20240110;
@@ -762,7 +762,7 @@
     refreshSheet(); // pushState does not trigger onpopstate event
   }
 
-  function getResults(statementsAndSystems: string, myRefreshCount: bigint) {
+  function getResults(statementsAndSystems: string, myRefreshCount: BigInt) {
     return new Promise<Results>((resolve, reject) => {
       function handleWorkerMessage(e) {
         forcePyodidePromiseRejection = null;
@@ -819,13 +819,14 @@
           statements.push(mathField.statement);
         }
       } else if (cell instanceof TableCell) {
-        const newStatements = cell.parseTableStatements();
+        const newStatements = cell.tableStatements;
         for (const statement of newStatements) {
           endStatements.push(statement);
         }
       } else if (cell instanceof PiecewiseCell) {
-        const statement = cell.parsePiecewiseStatement(cellNum);
-        endStatements.push(statement);
+        if (cell.piecewiseStatement) {
+          endStatements.push(cell.piecewiseStatement);
+        }
       } else if (cell instanceof SystemCell) {
         const systemDefinition = cell.getSystemDefinition();
         if (systemDefinition) {
@@ -870,15 +871,18 @@
     }
   }
 
-  async function handleCellUpdate() {
-    const myRefreshCount = ++refreshCounter;
+  async function handleCellUpdate(localRefreshCounter: BigInt) {
+    if (localRefreshCounter !== refreshCounter) {
+      return;
+    }
+    const myRefreshCount = localRefreshCounter;
     const firstRunAfterSheetLoad = initialSheetLoad;
     initialSheetLoad = false;
     inDebounce = false;
     if(noParsingErrors && !firstRunAfterSheetLoad) {
-      // remove existing results if all math fields are valid (while editing current cell)
-      // also, don't clear results if sheet was just loaded without modification (initialSheetLoad === true)
-      $results = [];
+      // invalidate results if all math fields are valid (while editing current cell)
+      // also, don't invalidate results if sheet was just loaded without modification (initialSheetLoad === true)
+      $resultsInvalid = true;
       error = "";
     }
     await pyodidePromise;
@@ -888,17 +892,20 @@
       clearTimeout(pyodideTimeoutRef);
       pyodideTimeoutRef = window.setTimeout(() => pyodideTimeout=true, pyodideTimeoutLength);
       if (!firstRunAfterSheetLoad) {
-        $results = [];
+        $resultsInvalid = true;
         error = "";
       }
       pyodidePromise = getResults(statementsAndSystems, myRefreshCount)
       .then((data: Results) => {
         $results = [];
+        $resultsInvalid = false;
         if (!data.error && data.results.length > 0) {
           let counter = 0;
           for (const [i, cell] of $cells.entries()) {
             if ((cell.type === "math" || cell.type === "plot") ) {
               $results[i] = data.results[counter++]; 
+            } else {
+              $results[i] = null;
             }
           }
         }
@@ -908,6 +915,8 @@
         for (const [i, cell] of $cells.entries()) {
           if (cell.type === "system") {
             $system_results[i] = data.systemResults[counter++]
+          } else {
+            $system_results[i] = null;
           }
         }
         if (!firstRunAfterSheetLoad) {
@@ -1089,6 +1098,7 @@ Please include a link to this sheet in the email to assist in debugging the prob
 
       $cells = [];
       $results = [];
+      $resultsInvalid = true;
       $system_results = [];
       $activeCell = -1;
 
@@ -1114,10 +1124,12 @@ Please include a link to this sheet in the email to assist in debugging the prob
 
       if (noParsingErrors) {
         $results = sheet.results;
+        $resultsInvalid = false;
         // old documents in the database won't have the system_results property
         $system_results = sheet.system_results ? sheet.system_results : [];
       } else {
         $results = [];
+        $resultsInvalid = true;
         $system_results = [];
       }
 
@@ -1479,6 +1491,7 @@ Please include a link to this sheet in the email to assist in debugging the prob
 
     try{
       $results = [];
+      $resultsInvalid = true;
       $system_results = [];
 
       const newCells = sheet.cells.map(cellFactory);
@@ -1912,29 +1925,21 @@ Please include a link to this sheet in the email to assist in debugging the prob
     };
   }
 
-  $:{
-    if (document.hasFocus() && showKeyboard !== Boolean($activeMathField)) {
+  $:if (document.hasFocus() && showKeyboard !== Boolean($activeMathField)) {
       showKeyboard = Boolean($activeMathField);
     }
-  }
 
-  $: {
-    document.title = `EngineeringPaper.xyz: ${$title}`;
-  }
+  $: document.title = `EngineeringPaper.xyz: ${$title}`;
 
-  $: if($cells) {
+  $: if($mathCellChanged) {
+    refreshCounter++;
+    $mathCellChanged = false;
     noParsingErrors = !checkParsingErrors();
-  }
-
-  $: if ($cells || $mathCellChanged) {
-    if($mathCellChanged) {
-      if (initialSheetLoad) {
-        handleCellUpdate();
-      } else {
-        inDebounce = true;
-        debounceHandleCellUpdate();
-      }
-      $mathCellChanged = false;
+    if (initialSheetLoad) {
+      handleCellUpdate(refreshCounter);
+    } else {
+      inDebounce = true;
+      debounceHandleCellUpdate(refreshCounter);
     }
     $unsavedChange = true;
     $autosaveNeeded = true;
@@ -2194,6 +2199,12 @@ Please include a link to this sheet in the email to assist in debugging the prob
     }
   }
 
+  @media (max-width: 450px) {
+    :global(.hide-when-kinda-narrow) {
+      display: none;
+    }
+  }
+
   @media (max-width: 400px) {
     :global(.hide-when-narrow) {
       display: none;
diff --git a/src/Cell.svelte b/src/Cell.svelte
index 84b47b19..82188909 100644
--- a/src/Cell.svelte
+++ b/src/Cell.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
-  import { createEventDispatcher } from "svelte";
-  import { cells, results, activeCell, mathCellChanged, handleClickInCell, deleteCell } from "./stores";
+  import { createEventDispatcher, onMount } from "svelte";
+  import { cells, results, system_results, activeCell, 
+           mathCellChanged, handleClickInCell, deleteCell } from "./stores";
   import type { Cell } from './cells/Cells';
   import MathCellElement from "./MathCell.svelte";
   import DocumentationCellElement from "./DocumentationCell.svelte";
@@ -46,15 +47,17 @@
     }
   }
 
+  onMount(() => {
+    if(cell instanceof DeletedCell && cell.height > 0) {
+      contentDiv.setAttribute("style", `height: ${cell.height}px;`);
+    } 
+  });
+
   function moveUp(index) {
     if (index > 0) {
-      let newCells = $cells.slice(0,index-1);
-      newCells.push($cells[index]);
-      newCells.push($cells[index-1]);
-      newCells = newCells.concat($cells.slice(index+1, $cells.length+1));
-      $cells = newCells;
-
-      $results = [];
+      $cells = [...$cells.slice(0,index-1), $cells[index], $cells[index-1], ...$cells.slice(index+1, $cells.length+1)];
+      $results = [...$results.slice(0,index-1), $results[index], $results[index-1], ...$results.slice(index+1, $cells.length+1)];
+      $system_results = [...$system_results.slice(0,index-1), $system_results[index], $system_results[index-1], ...$system_results.slice(index+1, $cells.length+1)];
 
       if (index === $activeCell) {
         $activeCell--;
@@ -66,13 +69,9 @@
 
   function moveDown(index) {
     if (index < $cells.length-1) {
-      let newCells = $cells.slice(0, index);
-      newCells.push($cells[index+1]);
-      newCells.push($cells[index]);
-      newCells = newCells.concat($cells.slice(index+2, $cells.length+1));
-      $cells = newCells;
-
-      $results = [];
+      $cells = [...$cells.slice(0, index), $cells[index+1], $cells[index], ...$cells.slice(index+2, $cells.length+1)];
+      $results = [...$results.slice(0, index), $results[index+1], $results[index], ...$results.slice(index+2, $cells.length+1)];
+      $system_results = [...$system_results.slice(0, index), $system_results[index+1], $system_results[index], ...$system_results.slice(index+2, $cells.length+1)];
 
       if (index === $activeCell) {
         $activeCell++;
diff --git a/src/CellList.svelte b/src/CellList.svelte
index e433ef5a..e911b75b 100644
--- a/src/CellList.svelte
+++ b/src/CellList.svelte
@@ -2,7 +2,7 @@
   import { tick } from "svelte";
   import { flip } from "svelte/animate";
 
-  import { cells, results, activeCell, prefersReducedMotion, mathCellChanged } from "./stores";
+  import { cells, results, system_results, activeCell, mathCellChanged } from "./stores";
   import Cell from "./Cell.svelte";
   import ButtonBar from "./ButtonBar.svelte";
 
@@ -124,16 +124,33 @@
           $cells = [...$cells.slice(0,targetIndex), $cells[draggingSourceIndex], 
                     ...$cells.slice(targetIndex, draggingSourceIndex),
                     ...$cells.slice(draggingSourceIndex+1)];
+
+          $results = [...$results.slice(0,targetIndex), $results[draggingSourceIndex], 
+                      ...$results.slice(targetIndex, draggingSourceIndex),
+                      ...$results.slice(draggingSourceIndex+1)];
+
+          $system_results = [...$system_results.slice(0,targetIndex), $system_results[draggingSourceIndex], 
+                             ...$system_results.slice(targetIndex, draggingSourceIndex),
+                             ...$system_results.slice(draggingSourceIndex+1)];
         } else {
           $cells = [...$cells.slice(0,draggingSourceIndex), 
                     ...$cells.slice(draggingSourceIndex+1, targetIndex+1),          
                     $cells[draggingSourceIndex], 
                     ...$cells.slice(targetIndex+1)];
+
+          $results = [...$results.slice(0,draggingSourceIndex), 
+                      ...$results.slice(draggingSourceIndex+1, targetIndex+1),          
+                      $results[draggingSourceIndex], 
+                      ...$results.slice(targetIndex+1)];
+
+          $system_results = [...$system_results.slice(0,draggingSourceIndex), 
+                             ...$system_results.slice(draggingSourceIndex+1, targetIndex+1),          
+                             $system_results[draggingSourceIndex], 
+                             ...$system_results.slice(targetIndex+1)];
         }
 
         draggingSourceIndex = targetIndex;
 
-        $results = [];
         $mathCellChanged = true;
       }
 
diff --git a/src/DeletedCell.svelte b/src/DeletedCell.svelte
index ec941a6d..89ebad88 100644
--- a/src/DeletedCell.svelte
+++ b/src/DeletedCell.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount, onDestroy } from 'svelte';
   import type DeletedCell from "./cells/DeletedCell";
-  import { cells, activeCell, results, mathCellChanged } from "./stores";
+  import { cells, activeCell, results, system_results, mathCellChanged } from "./stores";
 
   export let index: number;
   export let deletedCell: DeletedCell;
@@ -19,7 +19,8 @@
   onMount(() => {
     intervalId = setInterval(intervalFunc, delta);
     if (buttonElement) {
-      buttonElement.focus();
+      buttonElement.focus({preventScroll: true});
+      setTimeout(() => buttonElement.scrollIntoView({behavior: "smooth", block: "nearest"}), 100);
     }
   });
 
@@ -39,13 +40,16 @@
   function deleteMyself() {
     if (deletedCell.id === $cells[index].id) { 
       $cells = [...$cells.slice(0,index), ...$cells.slice(index+1)];
+      $results = [...$results.slice(0,index), ...$results.slice(index+1)];
+      $system_results = [...$system_results.slice(0,index), ...$system_results.slice(index+1)];
+
       if ($activeCell > index ) {
         $activeCell -= 1;
       }
       if ($activeCell >= $cells.length) {
         $activeCell = $cells.length-1;
       }
-      $results = [];
+
       $mathCellChanged = true;
     }
   }
@@ -53,50 +57,66 @@
   function undoDelete() {
     clearInterval(intervalId);
     $cells = [...$cells.slice(0,index), deletedCell.deletedCell, ...$cells.slice(index+1)];
+    $results = [...$results.slice(0,index), null, ...$results.slice(index+1)];
+    $system_results = [...$system_results.slice(0,index), null, ...$system_results.slice(index+1)];
+
     $activeCell = index;
-    $results = [];
+
     $mathCellChanged = true;
   }
 
+  function handleKeyboard(event: KeyboardEvent) {
+    if (event.defaultPrevented) {
+      return;
+    }
+
+    if (event.key === "Escape") {
+      undoDelete();
+      event.preventDefault();
+      event.stopPropagation();
+    }
+  }
+
 </script>
 
 <style>
   div.container {
     display: flex;
-    padding: 20px;
     justify-content: center;
     background-color: whitesmoke;
     border-radius: 2px;
+    height: 100%;
   }
 
   div.controls {
-    display: flex;
-    flex-direction: column;
+    display: grid;
+    grid-auto-flow: column;
+
     align-items: center;
+    justify-content: center;
+    column-gap: 20px;
     width: fit-content;
-    row-gap: 10px;
-  }
-
-  p {
-    font-size: larger;
+    height: 100%;
   }
 
   button {
     background-color: white;
     border-radius: 5px;
+    padding: 2px;
   }
 </style>
 
 
 <div class="container">
   <div class="controls">
-    <p>Cell Deleted</p>
+    <p class="hide-when-kinda-narrow">Deleting Cell</p>
     <button 
       on:click={undoDelete}
+      on:keydown={handleKeyboard}
       bind:this={buttonElement}
     >
       Undo Delete
     </button>
-    <progress value={currentTime/timeout-.1}></progress>
+    <progress class="hide-when-really-narrow" value={currentTime/timeout-.1}></progress>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/GenerateCodeDialog.svelte b/src/GenerateCodeDialog.svelte
index ff64ec93..0ad37db1 100644
--- a/src/GenerateCodeDialog.svelte
+++ b/src/GenerateCodeDialog.svelte
@@ -22,7 +22,6 @@
     if (statement) {
       statement.generateCode = true;
 
-      $cells = $cells;
       $mathCellChanged = true;
     }
   });
diff --git a/src/InsertCell.svelte b/src/InsertCell.svelte
index 02cb09a6..85baa171 100644
--- a/src/InsertCell.svelte
+++ b/src/InsertCell.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import { onMount, onDestroy, createEventDispatcher } from 'svelte';
   import type InsertCell from "./cells/InsertCell";
-  import { cells, activeCell, results, mathCellChanged, inCellInsertMode, addCell, onMobile } from "./stores";
+  import { cells, activeCell, results, system_results, mathCellChanged, 
+           inCellInsertMode, addCell, onMobile, modifierKey } from "./stores";
   import type { CellTypes } from "./cells/BaseCell";
 
   import AddAlt from "carbon-icons-svelte/lib/AddAlt.svelte";
@@ -20,7 +21,7 @@
   const delta = 50;
   let currentTime = timeout;
   let intervalId = null;
-  let firstButtonElement: HTMLElement;
+  let buttonArray: HTMLElement[] = [];
 
   const dispatch = createEventDispatcher();
 
@@ -37,9 +38,9 @@
 
   onMount(() => {
     intervalId = setInterval(intervalFunc, delta);
-    if (firstButtonElement) {
-      firstButtonElement.focus({preventScroll: true});
-      firstButtonElement.scrollIntoView({behavior: "smooth", block: "center"});
+    if (buttonArray[0]) {
+      buttonArray[0].focus({preventScroll: true});
+      buttonArray[0].scrollIntoView({behavior: "smooth", block: "center"});
     }
   });
 
@@ -60,11 +61,14 @@
   function deleteMyself() {
     if (insertCell.id === $cells[index].id) { 
       $cells = [...$cells.slice(0,index), ...$cells.slice(index+1)];
+      $results = [...$results.slice(0,index), ...$results.slice(index+1)];
+      $system_results = [...$system_results.slice(0,index), ...$system_results.slice(index+1)];
+
       $activeCell = index - 1;
       if ($activeCell >= $cells.length) {
         $activeCell = $cells.length-1;
       }
-      $results = [];
+
       $mathCellChanged = true;
     }
   }
@@ -74,6 +78,40 @@
     addCell(type, index);
   }
 
+  function handleKeyboard(event: KeyboardEvent, currentIndex: number) {
+    if (event.defaultPrevented || event[$modifierKey] || event.shiftKey) {
+      return;
+    }
+
+    switch (event.key) {
+      case "ArrowLeft":
+      case "ArrowDown":
+        currentIndex -= 1;
+        currentTime = timeout;
+        break;
+      case "ArrowRight":
+      case "ArrowUp":
+        currentIndex += 1;
+        currentTime = timeout;
+        break;
+      default:
+        return;
+    }
+
+    if (currentIndex < 0) {
+      currentIndex = buttonArray.length - 1;
+    } else if(currentIndex >= buttonArray.length) {
+      currentIndex = 0;
+    }
+
+    if (buttonArray[currentIndex]) {
+      buttonArray[currentIndex].focus({preventScroll: true});
+    }
+  
+    // Cancel the default action to avoid it being handled twice
+    event.preventDefault();
+  }
+
 </script>
 
 <style>
@@ -138,7 +176,8 @@
       <button 
         id={"insert-popup-button-1"}
         on:click={() => insertNewCell('math')}
-        bind:this={firstButtonElement}
+        bind:this={buttonArray[0]}
+        on:keydown={(e) => handleKeyboard(e, 0)}
       >
         <div class="button-text" class:mobile={$onMobile}>
           {#if !$onMobile}
@@ -152,6 +191,8 @@
       <button 
         id={"insert-popup-button-2"}
         on:click={() => insertNewCell('documentation')}
+        bind:this={buttonArray[1]}
+        on:keydown={(e) => handleKeyboard(e, 1)}
       >
         <div class="button-text">
           {#if !$onMobile}
@@ -167,6 +208,8 @@
       <button 
         id={"insert-popup-button-3"}
         on:click={() => insertNewCell('plot')}
+        bind:this={buttonArray[2]}
+        on:keydown={(e) => handleKeyboard(e, 2)}
       >
         <div class="button-text">
           {#if !$onMobile}
@@ -180,6 +223,8 @@
       <button 
         id={"insert-popup-button-4"}
         on:click={() => insertNewCell('table')}
+        bind:this={buttonArray[3]}
+        on:keydown={(e) => handleKeyboard(e, 3)}
       >
         <div class="button-text">
           {#if !$onMobile}
@@ -193,6 +238,8 @@
       <button 
         id={"insert-popup-button-5"}
         on:click={() => insertNewCell('piecewise')}
+        bind:this={buttonArray[4]}
+        on:keydown={(e) => handleKeyboard(e, 4)}
       >
         <div class="button-text">
           {#if !$onMobile}
@@ -208,6 +255,8 @@
       <button 
         id={"insert-popup-button-6"}
         on:click={() => insertNewCell('system')}
+        bind:this={buttonArray[5]}
+        on:keydown={(e) => handleKeyboard(e, 5)}
       >
         <div class="button-text">
           {#if !$onMobile}
@@ -221,6 +270,8 @@
       <button 
         id={"insert-popup-button-7"}
         on:click={insertSheet}
+        bind:this={buttonArray[6]}
+        on:keydown={(e) => handleKeyboard(e, 6)}
       >
         <div class="button-text">
           {#if !$onMobile}
@@ -234,6 +285,8 @@
       <button 
         id={"insert-popup-button-esc"}
         on:click={deleteMyself}
+        bind:this={buttonArray[7]}
+        on:keydown={(e) => handleKeyboard(e, 7)}
       >
         <div class="button-text">
           {#if !$onMobile}
diff --git a/src/MathCell.svelte b/src/MathCell.svelte
index 5bee9b2f..9d565a2a 100644
--- a/src/MathCell.svelte
+++ b/src/MathCell.svelte
@@ -2,7 +2,7 @@
   import { onMount, createEventDispatcher, SvelteComponent } from "svelte";
   import { get_current_component } from "svelte/internal";
   import { bignumber, format, unaryMinus, type BigNumber, type FormatOptions } from "mathjs";
-  import { cells, results, activeCell, mathCellChanged, config } from "./stores";
+  import { cells, results, resultsInvalid, activeCell, mathCellChanged, config } from "./stores";
   import { isFiniteImagResult, type Result, type FiniteImagResult,
            type PlotResult, type MatrixResult, isMatrixResult } from "./resultTypes";
            import type { CodeFunctionQueryStatement, QueryStatement } from "./parser/types";
@@ -87,7 +87,7 @@
   function parseLatex(latex: string, index: number) {
     mathCell.mathField.parseLatex(latex);
     $mathCellChanged = true;
-    $cells = $cells;
+    $cells[index] = $cells[index];
   }
 
   function scientificToLatex(value: string): string {
@@ -330,6 +330,12 @@
       <span slot="tooltipText">{mathCell.mathField.parsingErrorMessage}</span>
       <Error class="error"/>
     </TooltipIcon>
+    {#if result && !(result instanceof Array)}
+      <MathField
+        hidden={true}
+        latex={`${resultLatex}${resultUnitsLatex}`}
+      />
+    {/if}
   {:else if result && mathCell.mathField.statement &&
       mathCell.mathField.statement.type === "query"}
     {#if !(result instanceof Array)}
@@ -337,6 +343,7 @@
         <span class="hidden" id="{`result-value-${index}`}">{resultLatex}</span>
         <span class="hidden" id="{`result-units-${index}`}">{resultUnits}</span>
         <MathField
+          hidden={$resultsInvalid}
           latex={`${resultLatex}${resultUnitsLatex}`}
         />
       {:else}
diff --git a/src/MathField.svelte b/src/MathField.svelte
index 42281f62..f2f88d46 100644
--- a/src/MathField.svelte
+++ b/src/MathField.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { onMount, onDestroy, createEventDispatcher } from "svelte";
-  import { modifierKey, activeMathField, results } from "./stores";
+  import { modifierKey, activeMathField, results, resultsInvalid } from "./stores";
   import type { MathField } from "./cells/MathField";
 
   import type { MathfieldElement } from "mathlive";
@@ -10,6 +10,7 @@
   export let mathField: MathField | null = null;
   export let parsingError = false;
   export let editable = false;
+  export let hidden = false;
 
   export function getMathField() {
     return mathLiveField;
@@ -52,6 +53,8 @@
 
       mathLiveField.mathModeSpace = '\\:';
 
+      mathLiveField.keybindings = getKeybindings(mathLiveField);
+
       setLatex(latex); // set initial latex value
     } else {
       mathLiveField.readOnly = true;
@@ -67,7 +70,6 @@
   } 
 
   function handleKeyDown(e: KeyboardEvent) {
-    let reDispatch = false;
     if (e.key === 'Tab' && !e.shiftKey) {
       e.preventDefault();
       let hasPlaceholder = false;
@@ -81,15 +83,9 @@
       if (hasPlaceholder || startingPosition === mathLiveField.position) {
         mathLiveField.executeCommand('moveToNextPlaceholder');
       }
-    } else if (e.key === '\\') {
-      e.preventDefault();
-      mathLiveField.executeCommand(['insert', '\\backslash']);
     } else if (e.key === '|') {
       e.preventDefault();
       mathLiveField.executeCommand(['insert', '|']);
-    } else if (e.key === 'Escape') {
-      e.preventDefault();
-      reDispatch = true;
     } else if (e.key === 'Enter') {
       if (!mathLiveField.shadowRoot.querySelector(".ui-menu-container")) {
         e.preventDefault();
@@ -114,24 +110,6 @@
       //@ts-ignore
       mathLiveField.showMenu();
     }
-
-
-    if (reDispatch) {
-      // dispatch new event on parent to preserve escape behavior at app level
-      const newEvent = new KeyboardEvent("keydown", {
-        key: e.key,
-        code: e.code,
-        location: e.location,
-        repeat: e.repeat,
-        ctrlKey: e.ctrlKey,
-        shiftKey: e.shiftKey,
-        altKey: e.altKey,
-        metaKey: e.metaKey,
-        bubbles: true, 
-        cancelable: true
-      });
-      mathLiveField.parentElement.dispatchEvent(newEvent);
-    }
   }
 
   function handleFocusIn() {
@@ -146,8 +124,8 @@
         mathField.setPendingLatex();
 
         if (mathField.parsingError) {
-          // there is a parsing error, clear any existing results after leaving cell
-          $results = [];
+          // there is a parsing error, invalidate existing results after leaving cell
+          $resultsInvalid = true;
         }
       }
     }
@@ -211,11 +189,27 @@
     ];
   }
 
-  // workaround needed for move cell inlineShortcuts bug (also impacts menuItems)
+  const keybindingsToExclude = [
+    "ctrl+[Minus]",
+    "shift+[Escape]",
+    "[Escape]",
+    "[IntlBackslash]",
+    "alt+[Backslash]",
+    "\\"
+  ];
+
+  function getKeybindings(mf: MathfieldElement) {
+    return [
+      ...mf.keybindings.filter((value) => !keybindingsToExclude.includes(value.key)),
+    ]
+  }
+
+  // workaround needed for move cell inlineShortcuts bug (also impacts menuItems and keybindings)
   $: if (editable && mathLiveField) {
     mathLiveField.inlineShortcuts = INLINE_SHORTCUTS;
     //@ts-ignore
     mathLiveField.menuItems = getContextMenuItems(mathLiveField, editable);
+    mathLiveField.keybindings = getKeybindings(mathLiveField);
   }
 
   $: if (!editable && mathLiveField ) {
@@ -242,7 +236,7 @@
   }
 
   math-field.editable {
-    min-width: 1rem;
+    min-width: 2rem;
     border: solid 1px gray;
     padding-left: 2px;
     padding-right: 2px;
@@ -250,6 +244,10 @@
     padding-bottom: 1px;
   }
 
+  math-field.hidden {
+    visibility: hidden;
+  }
+
   math-field.parsing-error:not(:focus) {
     background-color: #f0b9b9;
   }
@@ -295,6 +293,7 @@
   bind:this={mathLiveField}
   class:editable
   class:parsing-error={parsingError}
+  class:hidden
 >
 </math-field>
 
diff --git a/src/PiecewiseCell.svelte b/src/PiecewiseCell.svelte
index 473687d1..d5957ae3 100644
--- a/src/PiecewiseCell.svelte
+++ b/src/PiecewiseCell.svelte
@@ -60,6 +60,7 @@
 
   async function addRow() {
     piecewiseCell.addRow();
+    $mathCellChanged = true;
     $cells = $cells;
     await tick();
     if (piecewiseCell.expressionFields.slice(-2)[0].element?.focus) {
@@ -69,15 +70,16 @@
 
   function deleteRow(rowIndex: number) {
     piecewiseCell.deleteRow(rowIndex);
+    piecewiseCell.parsePiecewiseStatement();
     $mathCellChanged = true;
     $cells = $cells;
   }
 
   function parseLatex(latex: string, mathField: MathFieldClass) {
     mathField.parseLatex(latex);
-    
+    piecewiseCell.parsePiecewiseStatement();
     $mathCellChanged = true;
-    $cells = $cells;
+    $cells[index] = $cells[index];
   }
 
   function handleEnter(row: number) {
diff --git a/src/PlotCell.svelte b/src/PlotCell.svelte
index 1273e7d1..1cd521b5 100644
--- a/src/PlotCell.svelte
+++ b/src/PlotCell.svelte
@@ -79,7 +79,7 @@
   function parseLatex(latex: string, mathField: MathFieldClass) {
     mathField.parseLatex(latex);
     $mathCellChanged = true;
-    $cells = $cells;
+    $cells[index] = $cells[index];
   }
 
   async function addMathField() {
diff --git a/src/SystemCell.svelte b/src/SystemCell.svelte
index d9baca83..9e9728da 100644
--- a/src/SystemCell.svelte
+++ b/src/SystemCell.svelte
@@ -101,7 +101,7 @@
   function parseLatex(latex: string, mathField: MathFieldClass) {
     mathField.parseLatex(latex);
     $mathCellChanged = true;
-    $cells = $cells;
+    $cells[index] = $cells[index];
     $system_results[index] = null;
   }
 
diff --git a/src/TableCell.svelte b/src/TableCell.svelte
index 762bd37b..f41dcc82 100644
--- a/src/TableCell.svelte
+++ b/src/TableCell.svelte
@@ -28,7 +28,6 @@
   import IconButton from "./IconButton.svelte";
 
   import { deltaToMarkdown } from "quill-delta-to-markdown";
-  import { column } from "mathjs";
 
   export let index: number;
   export let tableCell: TableCell;
@@ -103,6 +102,7 @@
 
   function handleSelectedRowChange() {
     $mathCellChanged = true;
+    tableCell.parseTableStatements();
     if (tableCell.rowJsons.length > 0) {
       (tableCell.richTextInstance as any).setContents(tableCell.rowJsons[tableCell.selectedRow]);
     }
@@ -146,13 +146,17 @@
   function deleteRow(rowIndex: number) {
     if (tableCell.deleteRow(rowIndex)) {
       handleSelectedRowChange();
+    } else {
+      tableCell.parseTableStatements();
     }
+    
     $mathCellChanged = true;
     $cells = $cells;
   }
 
   function deleteColumn(colIndex: number) {
     tableCell.deleteColumn(colIndex);
+    tableCell.parseTableStatements();
     $mathCellChanged = true;
     $cells = $cells;
   }
@@ -177,8 +181,10 @@
       tableCell.parseUnitField(latex, column);
     }
     
+    tableCell.parseTableStatements();
+
     $mathCellChanged = true;
-    $cells = $cells;
+    $cells[index] = $cells[index];
   }
 
   $: if ($activeCell === index) {
diff --git a/src/Updates.svelte b/src/Updates.svelte
index 59bd2b82..ada6eb2e 100644
--- a/src/Updates.svelte
+++ b/src/Updates.svelte
@@ -16,6 +16,20 @@
   }
 </style>
 
+<em>May 13, 2024</em>
+<h4>Usability Improvements and Bug Fixes</h4>
+<p>
+   This release includes the following usability improvements and bug fixes:
+</p>
+<ul>
+   <li>Vertical page jumps when editing, moving, or deleting cells has been eliminated improving visual stability and overall performance</li>
+   <li>Bug fixed where the sheet would hang when the last row of a table cell was selected and an earlier row was deleted</li>
+   <li>Reduced loading time and memory usage for large sheets</li>
+   <li>Improved performance when editing sheets with a large number of table cells or piecewise expression cells</li>
+</ul>
+
+<br>
+
 <em>April 18, 2024</em>
 <h4>Maximum Matrix Columns Limit Increased</h4>
 <p>
diff --git a/src/cells/DeletedCell.ts b/src/cells/DeletedCell.ts
index f938134b..dc2c04d5 100644
--- a/src/cells/DeletedCell.ts
+++ b/src/cells/DeletedCell.ts
@@ -4,10 +4,12 @@ import type { Cell } from "./Cells";
 
 export default class DeletedCell extends BaseCell {
   deletedCell: Cell
+  height: number
 
-  constructor (deletedCell: Cell) {
+  constructor (deletedCell: Cell, height=0) {
     super("deleted");
     this.deletedCell = deletedCell;
+    this.height = height;
   }
 
   serialize() {
diff --git a/src/cells/PiecewiseCell.ts b/src/cells/PiecewiseCell.ts
index a690683c..74fbd4f3 100644
--- a/src/cells/PiecewiseCell.ts
+++ b/src/cells/PiecewiseCell.ts
@@ -6,6 +6,7 @@ export default class PiecewiseCell extends BaseCell {
   parameterField: MathField;
   expressionFields: MathField[];
   conditionFields: MathField[];
+  piecewiseStatement: Statement | null;
 
   constructor (arg?: DatabasePiecewiseCell) {
     if (arg === undefined) {
@@ -13,11 +14,13 @@ export default class PiecewiseCell extends BaseCell {
       this.parameterField = new MathField('', 'parameter');
       this.expressionFields = [new MathField('', 'expression_no_blank'), new MathField('', 'expression_no_blank')];
       this.conditionFields = [new MathField('', 'condition'), ];
+      this.piecewiseStatement = null;
     } else {
       super("piecewise", arg.id);
       this.parameterField = new MathField(arg.parameterLatex, 'parameter');
       this.expressionFields = arg.expressionLatexs.map((latex) => new MathField(latex, "expression_no_blank"));
       this.conditionFields = arg.conditionLatexs.map((latex) => new MathField(latex, "condition"));
+      this.piecewiseStatement = null;
     }
   }
 
@@ -31,18 +34,24 @@ export default class PiecewiseCell extends BaseCell {
     };
   }
   
-  parsePiecewiseStatement(cellNum: number): Statement {
-    let args = this.expressionFields
-                   .slice(0,-1)
-                   .map((exp, index) => `(${exp.latex},${this.conditionFields[index].latex}),`)
-                   .reduce((accum, value) => accum + value, '');
-    const latex = `${this.parameterField.latex} = piecewise( ${args}(${this.expressionFields.slice(-1)[0].latex}, 1>0) )`;
+  parsePiecewiseStatement() {
+    if (!(this.parameterField.parsingError || 
+          this.expressionFields.some(value => value.parsingError) ||
+          this.conditionFields.some(value => value.parsingError))) {
+      let args = this.expressionFields
+                    .slice(0,-1)
+                    .map((exp, index) => `(${exp.latex},${this.conditionFields[index].latex}),`)
+                    .reduce((accum, value) => accum + value, '');
+      const latex = `${this.parameterField.latex} = piecewise( ${args}(${this.expressionFields.slice(-1)[0].latex}, 1>0) )`;
 
-    const mathField = new MathField(latex, 'piecewise');
+      const mathField = new MathField(latex, 'piecewise');
 
-    mathField.parseLatex(latex);
+      mathField.parseLatex(latex);
 
-    return mathField.statement;
+      this.piecewiseStatement =  mathField.statement;
+    } else {
+      this.piecewiseStatement = null;
+    }
   }
 
 
diff --git a/src/cells/TableCell.ts b/src/cells/TableCell.ts
index dd7c9257..750b4ce5 100644
--- a/src/cells/TableCell.ts
+++ b/src/cells/TableCell.ts
@@ -1,6 +1,7 @@
 import { BaseCell, type DatabaseTableCell } from "./BaseCell";
 import { MathField } from "./MathField";
 import type { Statement } from "../parser/types";
+import QuickLRU from "quick-lru";
 
 class TableRowLabelField {
   label: string;
@@ -25,6 +26,8 @@ export default class TableCell extends BaseCell {
   hideUnselected: boolean;
   rowJsons: string[];
   richTextInstance: HTMLElement | null;
+  tableStatements: Statement[];
+  cache: QuickLRU<string, Statement>;
 
   constructor (arg?: DatabaseTableCell) {
     if (arg === undefined) {
@@ -41,6 +44,8 @@ export default class TableCell extends BaseCell {
       this.hideUnselected = false;
       this.rowJsons = [];
       this.richTextInstance = null;
+      this.tableStatements = [];
+      this.cache = new QuickLRU<string, Statement>({maxSize: 100});
     } else {
       super("table", arg.id);
       this.rowLabels = arg.rowLabels.map((label) => new TableRowLabelField(label));
@@ -54,6 +59,8 @@ export default class TableCell extends BaseCell {
       this.hideUnselected = arg.hideUnselected;
       this.rowJsons = arg.rowJsons;
       this.richTextInstance = null;
+      this.tableStatements = [];
+      this.cache = new QuickLRU<string, Statement>({maxSize: 100});
     }
   }
 
@@ -87,9 +94,9 @@ export default class TableCell extends BaseCell {
   }
 
   
-  parseTableStatements(): Statement[] {
+  parseTableStatements() {
     const rowIndex = this.selectedRow;
-    const statements = [];
+    this.tableStatements = [];
   
     if (!(this.parameterFields.some(value => value.parsingError) ||
           this.parameterUnitFields.some(value => value.parsingError) ||
@@ -101,14 +108,16 @@ export default class TableCell extends BaseCell {
                           this.rhsFields[rowIndex][colIndex].latex +
                           this.parameterUnitFields[colIndex].latex;
 
-          this.combinedFields[colIndex].parseLatex(combinedLatex);
-
-          statements.push(this.combinedFields[colIndex].statement);
+          if (this.cache.has(combinedLatex)) {
+            this.tableStatements.push(this.cache.get(combinedLatex));
+          } else {
+            this.combinedFields[colIndex].parseLatex(combinedLatex);
+            this.tableStatements.push(this.combinedFields[colIndex].statement);
+            this.cache.set(combinedLatex, this.combinedFields[colIndex].statement)
+          }
         }
       }
-    } 
-  
-    return statements;
+    }
   }
 
   addRowDocumentation() {
@@ -162,7 +171,7 @@ export default class TableCell extends BaseCell {
     this.rhsFields = [...this.rhsFields.slice(0,rowIndex), 
                            ...this.rhsFields.slice(rowIndex+1)];
 
-    if (this.selectedRow === rowIndex) {
+    if (this.selectedRow >= rowIndex) {
       if (this.selectedRow !== 0) {
         this.selectedRow -= 1;
         return true
diff --git a/src/stores.ts b/src/stores.ts
index 7a54c203..4c39b608 100644
--- a/src/stores.ts
+++ b/src/stores.ts
@@ -25,8 +25,9 @@ export const autosaveNeeded = writable(false);
 export const config = writable(getDefaultConfig());
 export const cells: Writable<Cell[]> = writable([]);
 export const title = writable(defaultTitle);
-export const results: Writable<(Result | FiniteImagResult | MatrixResult | PlotResult[])[]> = writable([]);
-export const system_results: Writable<SystemResult[]> = writable([]);
+export const results: Writable<(Result | FiniteImagResult | MatrixResult | PlotResult[] | null)[]> = writable([]);
+export const system_results: Writable<SystemResult[] | null> = writable([]);
+export const resultsInvalid = writable(false);
 export const sheetId = writable('');
 export const insertedSheets: Writable<InsertedSheet[]> = writable([]);
 
@@ -52,8 +53,9 @@ export const mathJaxLoaded = writable(false);
 
 
 export function addCell(type: CellTypes, index?: number) {
-  const currentCells:Cell[] = get(cells);
-  const current_system_results:any[] = get(system_results);
+  const currentCells = get(cells);
+  const currentResults = get(results);
+  const currentSystemResults = get(system_results);
 
   if (index === undefined){
     index = currentCells.length;
@@ -81,21 +83,17 @@ export function addCell(type: CellTypes, index?: number) {
   }
 
   currentCells.splice(index, 0, newCell);
-
   cells.set(currentCells);
 
-  results.set([]);
+  currentResults.splice(index, 0, null);
+  results.set(currentResults);
 
-  // Adding a cell cannot impact existing system cell results so adjust system_results array accordingly
-  current_system_results.splice(index, 0, null);
-  system_results.set(current_system_results);
+  currentSystemResults.splice(index, 0, null);
+  system_results.set(currentSystemResults);
 
   activeCell.set(index);
 
-  if (type === "documentation" || type === "table") {
-    mathCellChanged.set(true); // results will be cleared so force refresh
-  }
-
+  mathCellChanged.set(true);
 }
 
 export function handleClickInCell(index: number) {
@@ -111,7 +109,7 @@ export function getSheetObject(includeResults=true): Sheet {
     config: get(config),
     cells: get(cells).map(x => x.serialize()).filter(item => item !== null),
     title: get(title),
-    results: includeResults ? get(results) : [],
+    results: includeResults ? (get(resultsInvalid) ? [] : get(results)) : [],
     system_results: includeResults ? get(system_results) : [],
     nextId: BaseCell.nextId,
     sheetId: get(sheetId),
@@ -130,6 +128,7 @@ export function resetSheet() {
   cells.set([]);
   title.set(defaultTitle);
   results.set([]);
+  resultsInvalid.set(true);
   system_results.set([]);
   BaseCell.nextId = 0;
   history.set([]);
@@ -168,17 +167,32 @@ export function decrementActiveCell() {
 
 export function deleteCell(index: number, forceDelete=false) {
   const currentCells = get(cells);
+  const currentResults = get(results);
+  const currentSystemResults = get(system_results);
   const currentActiveCell = get(activeCell);
   
   let newCells: Cell[];
+  let newResults: (Result | FiniteImagResult | MatrixResult | PlotResult[])[];
+  let newSystemResults: SystemResult[];
 
   if (currentCells[index].type !== "deleted" && 
       currentCells[index].type !== "insert" &&
       !forceDelete) {
-    newCells = [...currentCells.slice(0,index), new DeletedCellClass(currentCells[index]), ...currentCells.slice(index+1)];
+    
+    const contentDiv = document.getElementById(`cell-${index}`);
+    let height = 0;
+    if (contentDiv) {
+      height = contentDiv.getBoundingClientRect().height;
+    }
+
+    newCells = [...currentCells.slice(0,index), new DeletedCellClass(currentCells[index], height), ...currentCells.slice(index+1)];
+    newResults = [...currentResults.slice(0,index), null, ...currentResults.slice(index+1)];
+    newSystemResults = [...currentSystemResults.slice(0,index), null, ...currentSystemResults.slice(index+1)];
   } else {
     // user comfirming delete of an undo delete cell or a insert cell
     newCells = [...currentCells.slice(0,index), ...currentCells.slice(index+1)];
+    newResults = [...currentResults.slice(0,index), ...currentResults.slice(index+1)];
+    newSystemResults = [...currentSystemResults.slice(0,index), ...currentSystemResults.slice(index+1)];
   }
 
   if (currentActiveCell >= newCells.length) {
@@ -186,6 +200,10 @@ export function deleteCell(index: number, forceDelete=false) {
   }
 
   cells.set(newCells);
-  results.set([]);
+  results.set(newResults);
+  system_results.set(newSystemResults);
+
+  resultsInvalid.set(true);
+
   mathCellChanged.set(true);
 }
diff --git a/tests/images/chromium_reference.png b/tests/images/chromium_reference.png
index ca59b283..635d5b3c 100644
Binary files a/tests/images/chromium_reference.png and b/tests/images/chromium_reference.png differ
diff --git a/tests/images/firefox_reference.png b/tests/images/firefox_reference.png
index 1a1fa0e4..2993f4fd 100644
Binary files a/tests/images/firefox_reference.png and b/tests/images/firefox_reference.png differ
diff --git a/tests/images/webkit_reference.png b/tests/images/webkit_reference.png
index 4e504959..ea01ecb4 100644
Binary files a/tests/images/webkit_reference.png and b/tests/images/webkit_reference.png differ
diff --git a/tests/test_basic.spec.mjs b/tests/test_basic.spec.mjs
index 838ff552..6bbba7f7 100644
--- a/tests/test_basic.spec.mjs
+++ b/tests/test_basic.spec.mjs
@@ -1288,9 +1288,9 @@ test('Check parsing error handling impact on displayed results', async () => {
   content = await page.textContent('#result-value-1');
   expect(parseLatexFloat(content)).toBeCloseTo(5.11, precision);
 
-  // leave cell, result should dissapear
+  // leave cell, result should be made hidden
   await page.keyboard.press('Escape');
-  await page.locator('#result-value-1').waitFor({state: "detached", timeout: 500});
+  await page.locator('#cell-1 >> math-field:not(.editable)').waitFor({state: "hidden", timeout: 500});
 
 });
 
diff --git a/tests/test_file_save_open.spec.mjs b/tests/test_file_save_open.spec.mjs
index 31480fa3..58dca4d3 100644
--- a/tests/test_file_save_open.spec.mjs
+++ b/tests/test_file_save_open.spec.mjs
@@ -184,7 +184,7 @@ test('Test clearing results on valid input after page initial load form file', a
   await page.setLatex(0, '1=');
 
   // ensure that result is not displayed even though it is in file
-  await page.locator('#result-value-0').waitFor({state: "detached", timeout: 1000});
+  await page.locator('#cell-0 >> math-field:not(.editable)').waitFor({state: "hidden", timeout: 1000});
 
 });
 
diff --git a/tests/test_keyboard_shortcuts.spec.mjs b/tests/test_keyboard_shortcuts.spec.mjs
index 422fff44..2fd6ebe1 100644
--- a/tests/test_keyboard_shortcuts.spec.mjs
+++ b/tests/test_keyboard_shortcuts.spec.mjs
@@ -202,4 +202,43 @@ test('Test math cell undo/redo', async ({ browserName }) => {
   content = await page.textContent('#result-value-2');
   expect(parseLatexFloat(content)).toBeCloseTo(1010002, precision);
 
+});
+
+
+test('Test esc to undo delete', async ({ browserName }) => {
+
+  const modifierKey = (await page.evaluate('window.modifierKey') )=== "metaKey" ? "Meta" : "Control";
+
+  await page.locator('#cell-0 >> math-field.editable').type("x+y=");
+  await page.keyboard.press('Enter');
+  await page.locator('#cell-1 >> math-field.editable').type("x=1");
+  await page.keyboard.press('Enter');
+  await page.locator('#cell-2 >> math-field.editable').type("y=2");
+
+  await page.waitForSelector('text=Updating...', {state: 'detached'});
+  let content = await page.textContent(`#result-value-0`);
+  expect(parseLatexFloat(content)).toBeCloseTo(3, precision);
+  
+  // test undo delete using escape when delete triggered using keyboard shortcut
+  await page.locator('#cell-1 >> math-field.editable').click();
+  await expect(page.locator('#cell-1 >> math-field.editable')).toBeFocused();
+  await page.keyboard.press(modifierKey+'+D');
+  await expect(page.locator('text=Undo Delete')).toBeVisible();
+  await page.keyboard.press('Escape');
+
+  await page.waitForSelector('text=Updating...', {state: 'detached'});
+  content = await page.textContent(`#result-value-0`);
+  expect(parseLatexFloat(content)).toBeCloseTo(3, precision);
+
+  // test undo delete using escape when delete triggered using button
+  await page.locator('#cell-1 >> math-field.editable').click();
+  await expect(page.locator('#cell-1 >> math-field.editable')).toBeFocused();
+  await page.click('#delete-1');
+  await expect(page.locator('text=Undo Delete')).toBeVisible();
+  await page.keyboard.press('Escape');
+
+  await page.waitForSelector('text=Updating...', {state: 'detached'});
+  content = await page.textContent(`#result-value-0`);
+  expect(parseLatexFloat(content)).toBeCloseTo(3, precision);
+
 });
\ No newline at end of file
diff --git a/tests/test_table_cell.spec.mjs b/tests/test_table_cell.spec.mjs
index b5a80a9b..0a40e9f2 100644
--- a/tests/test_table_cell.spec.mjs
+++ b/tests/test_table_cell.spec.mjs
@@ -542,4 +542,35 @@ test('Test fix for crash when last column deleted', async () => {
   await page.locator('text=Updating...').waitFor({state: 'detached'});
   content = await page.locator('#result-value-0').textContent();
   expect(content).toBe('Var_{2}');
+});
+
+
+test('Test fix for crash when last row selected and not last row deleted', async () => {
+
+  await page.locator('math-field.editable').nth(0).type('Var1=');
+
+  await page.locator('#add-table-cell').click();
+
+  await page.locator('#grid-cell-1-0-0 math-field.editable').type('1');
+  await page.locator('#grid-cell-1-1-0 math-field.editable').type('2');
+
+  await page.locator('#row-radio-1-1').check();
+
+  await page.locator('text=Updating...').waitFor({state: 'detached'});
+  let content = await page.locator('#result-value-0').textContent();
+  expect(parseLatexFloat(content)).toBeCloseTo(2, precision);
+
+  // delete first row and make sure result updates (selected row should update to first row)
+  await page.locator('#delete-row-1-0').click();
+
+  // make sure second row is no longer visible
+  await page.locator('#row-radio-1-1').waitFor({state: 'detached', timeout: 1000});
+
+  // enter a value in column 2 to make sure everything is updating as expected
+  await page.locator('#grid-cell-1-0-1 math-field.editable').type('3');
+  await page.setLatex(0, 'Var2=');
+
+  await page.locator('text=Updating...').waitFor({state: 'detached'});
+  content = await page.locator('#result-value-0').textContent();
+  expect(parseLatexFloat(content)).toBeCloseTo(3, precision);
 });
\ No newline at end of file