diff --git a/renderer/src/components/EditorPage/AudioEditor/AudioEditor.js b/renderer/src/components/EditorPage/AudioEditor/AudioEditor.js
index 83d7efb2..ee9b2e0b 100644
--- a/renderer/src/components/EditorPage/AudioEditor/AudioEditor.js
+++ b/renderer/src/components/EditorPage/AudioEditor/AudioEditor.js
@@ -96,6 +96,33 @@ const loadVerseStructureFromFile = (projectsDir, bookId, chapter) => {
   }
 };
 
+const parsedUsfmCache = new Map();
+
+const getParsedUsfmBook = (usfmPath) => {
+  const fs = window.require('fs');
+
+  const stat = fs.statSync(usfmPath);
+  const cached = parsedUsfmCache.get(usfmPath);
+
+  if (cached && cached.mtimeMs === stat.mtimeMs && cached.size === stat.size) {
+    logger.debug('Using cached parsed USFM:', usfmPath);
+    return cached.bookContent;
+  }
+
+  const usfm = fs.readFileSync(usfmPath, 'utf8');
+  const myUsfmParser = new grammar.USFMParser(usfm, grammar.LEVEL.RELAXED);
+  const jsonOutput = myUsfmParser.toJSON();
+  const bookContent = jsonOutput.chapters;
+
+  parsedUsfmCache.set(usfmPath, {
+    mtimeMs: stat.mtimeMs,
+    size: stat.size,
+    bookContent,
+  });
+
+  return bookContent;
+};
+
 // Priority 2: Load from USFM
 const loadVersesFromUSFM = (projectsDir, bookId, chapter) => {
   try {
@@ -116,19 +143,7 @@ const loadVersesFromUSFM = (projectsDir, bookId, chapter) => {
       };
     }
 
-    const usfm = fs.readFileSync(usfmPath, 'utf8');
-    const myUsfmParser = new grammar.USFMParser(usfm, grammar.LEVEL.RELAXED);
-    const isJsonValid = myUsfmParser.validate();
-
-    if (!isJsonValid) {
-      logger.error('Invalid USFM file');
-      return {
-        success: false, bookContent: null, verses: null, source: null,
-      };
-    }
-
-    const jsonOutput = myUsfmParser.toJSON();
-    const bookContent = jsonOutput.chapters;
+    const bookContent = getParsedUsfmBook(usfmPath);
 
     const chapterData = bookContent.find(
       (ch) => ch.chapterNumber === chapter.toString(),
@@ -495,6 +510,8 @@ const AudioEditor = ({ editor }) => {
   useEffect(() => {
     if (!isElectron()) { return; }
 
+    let cancelled = false;
+
     structureAppliedRef.current = false;
 
     setIsLoading(true);
@@ -605,6 +622,8 @@ const AudioEditor = ({ editor }) => {
                 logger.debug('Data source:', dataSource);
                 logger.debug('Verse count:', finalVerses.length);
 
+                if (cancelled) { return; }
+
                 setOriginalBookContent(bookContent);
 
                 const versesWithAudios = structureAppliedRef.current
@@ -629,25 +648,30 @@ const AudioEditor = ({ editor }) => {
             }),
           );
 
-          if (_books.includes(bookId.toUpperCase()) === false) {
+          if (!cancelled && _books.includes(bookId.toUpperCase()) === false) {
             setAudioContent();
             setDisplayScreen(true);
+            setIsLoading(false);
           }
         }
       } catch (error) {
         logger.error('Error in useEffect:', error);
-        setIsLoading(false);
-        setDisplayScreen(true);
+        if (!cancelled) {
+          setIsLoading(false);
+          setDisplayScreen(true);
+        }
       }
     });
+
+    return () => { cancelled = true; };
   }, [bookId, chapter]);
 
   return (
     <div id="editor">
       <Editor callFrom="textTranslation" editor={editor}>
-        {((isLoading || !audioContent) && displyScreen) && <EmptyScreen call="audio" />}
-        {isLoading && !displyScreen && <LoadingScreen />}
-        {audioContent && isLoading === false
+        {isLoading && <LoadingScreen />}
+        {!isLoading && displyScreen && <EmptyScreen call="audio" />}
+        {!isLoading && audioContent
           && (
             <EditorPage
               verse={verse}
diff --git a/renderer/src/components/EditorPage/VideoEditor/VerseContextMenu.jsx b/renderer/src/components/EditorPage/VideoEditor/VerseContextMenu.jsx
index ba8fc502..8ec68ba2 100644
--- a/renderer/src/components/EditorPage/VideoEditor/VerseContextMenu.jsx
+++ b/renderer/src/components/EditorPage/VideoEditor/VerseContextMenu.jsx
@@ -17,7 +17,11 @@ const VerseContextMenu = ({
 }) => {
   const { t } = useTranslation();
 
-  if (!visible) {
+  const hasMenuItems = (!isFirstVerse && !isJoinedVerse)
+  || isJoinedVerse
+  || canOpenComments;
+
+  if (!visible || !hasMenuItems) {
     return null;
   }
 
diff --git a/renderer/src/components/EditorPage/VideoEditor/VideoEditor.js b/renderer/src/components/EditorPage/VideoEditor/VideoEditor.js
index 40ab58af..0edc6209 100644
--- a/renderer/src/components/EditorPage/VideoEditor/VideoEditor.js
+++ b/renderer/src/components/EditorPage/VideoEditor/VideoEditor.js
@@ -118,6 +118,33 @@ const loadVerseStructureFromFile = (projectsDir, bookId, chapter) => {
   }
 };
 
+const parsedUsfmCache = new Map();
+
+const getParsedUsfmBook = (usfmPath) => {
+  const fs = window.require('fs');
+
+  const stat = fs.statSync(usfmPath);
+  const cached = parsedUsfmCache.get(usfmPath);
+
+  if (cached && cached.mtimeMs === stat.mtimeMs && cached.size === stat.size) {
+    logger.debug('Using cached parsed USFM:', usfmPath);
+    return cached.bookContent;
+  }
+
+  const usfm = fs.readFileSync(usfmPath, 'utf8');
+  const myUsfmParser = new grammar.USFMParser(usfm, grammar.LEVEL.RELAXED);
+  const jsonOutput = myUsfmParser.toJSON();
+  const bookContent = jsonOutput.chapters;
+
+  parsedUsfmCache.set(usfmPath, {
+    mtimeMs: stat.mtimeMs,
+    size: stat.size,
+    bookContent,
+  });
+
+  return bookContent;
+};
+
 const loadVersesFromUSFM = (projectsDir, bookId, chapter) => {
   try {
     const fs = window.require('fs');
@@ -137,19 +164,7 @@ const loadVersesFromUSFM = (projectsDir, bookId, chapter) => {
       };
     }
 
-    const usfm = fs.readFileSync(usfmPath, 'utf8');
-    const myUsfmParser = new grammar.USFMParser(usfm, grammar.LEVEL.RELAXED);
-    const isJsonValid = myUsfmParser.validate();
-
-    if (!isJsonValid) {
-      logger.error('Invalid USFM file');
-      return {
-        success: false, bookContent: null, verses: null, source: null,
-      };
-    }
-
-    const jsonOutput = myUsfmParser.toJSON();
-    const bookContent = jsonOutput.chapters;
+    const bookContent = getParsedUsfmBook(usfmPath);
 
     const chapterData = bookContent.find(
       (ch) => ch.chapterNumber === chapter.toString(),
@@ -609,6 +624,8 @@ const VideoEditor = ({ editor }) => {
     modelClose();
   };
   useEffect(() => {
+    let cancelled = false;
+
     if (isElectron()) {
       setIsLoading(true);
       setDisplayScreen(false);
@@ -728,6 +745,8 @@ const VideoEditor = ({ editor }) => {
                     chapter,
                   );
 
+                  if (cancelled) { return; }
+
                   setOriginalBookContent(bookContent);
 
                   logger.debug('Starting video attachment process...');
@@ -760,18 +779,23 @@ const VideoEditor = ({ editor }) => {
               }),
             );
 
-            if (_books.includes(bookId.toUpperCase()) === false) {
+            if (!cancelled && _books.includes(bookId.toUpperCase()) === false) {
               setVideoContent();
               setDisplayScreen(true);
+              setIsLoading(false);
             }
           }
         } catch (error) {
           logger.error('Error in useEffect:', error);
-          setIsLoading(false);
-          setDisplayScreen(true);
+          if (!cancelled) {
+            setIsLoading(false);
+            setDisplayScreen(true);
+          }
         }
       });
     }
+
+    return () => { cancelled = true; };
   }, [bookId, chapter]);
 
   useEffect(() => {
@@ -808,9 +832,9 @@ const VideoEditor = ({ editor }) => {
 
   return (
     <Editor callFrom="textTranslation" editor={editor}>
-      {((isLoading || !videoContent) && displyScreen) && <EmptyScreen call="video" />}
-      {isLoading && !displyScreen && <LoadingScreen />}
-      {videoContent && isLoading === false
+      {isLoading && <LoadingScreen />}
+      {!isLoading && displyScreen && <EmptyScreen call="video" />}
+      {!isLoading && videoContent
         && (
           <div id="video-editor" className="h-full overflow-auto">
             <VideoPlayer
diff --git a/renderer/src/components/EditorPage/VideoEditor/VideoRecorder.js b/renderer/src/components/EditorPage/VideoEditor/VideoRecorder.js
index 83d5b997..1542a61b 100644
--- a/renderer/src/components/EditorPage/VideoEditor/VideoRecorder.js
+++ b/renderer/src/components/EditorPage/VideoEditor/VideoRecorder.js
@@ -17,6 +17,7 @@ import {
   ArrowsPointingOutIcon,
   ArrowsPointingInIcon,
   ChatBubbleLeftEllipsisIcon,
+  ArrowDownTrayIcon,
 } from '@heroicons/react/24/outline';
 
 import { useCamera } from '@/hooks/video/useCamera';
@@ -68,10 +69,12 @@ const VideoRecorder = ({
   const [selectedCamera, setSelectedCamera] = useState(null);
   const [existingVideo, setExistingVideo] = useState(false);
   const [currentMode, setCurrentMode] = useState(mode);
+  const [isImporting, setIsImporting] = useState(false);
 
   const videoPreviewRef = useRef(null);
   const containerRef = useRef(null);
   const seekBarRef = useRef(null);
+  const importInputRef = useRef(null);
 
   const fs = window.require('fs');
   const path = window.require('path');
@@ -261,6 +264,89 @@ const VideoRecorder = ({
     }
   };
 
+  const handleImportClick = () => {
+    const openImportPicker = () => {
+      if (importInputRef.current) {
+        importInputRef.current.value = '';
+        importInputRef.current.click();
+      }
+    };
+
+    if (existingVideo) {
+      setOpenModal({
+        openModel: true,
+        title: 'Replace Existing Video?',
+        confirmMessage: 'A video already exists for this verse. Importing a new video will replace the current recording.',
+        buttonName: 'Replace',
+        action: 'custom',
+        actionData: { callback: openImportPicker },
+      });
+      return;
+    }
+
+    openImportPicker();
+  };
+
+  const handleImportFileChange = async (e) => {
+    const file = e.target.files?.[0];
+    if (!file) { return; }
+
+    const supportedTypes = ['video/webm'];
+    const supportedExtensions = ['.webm'];
+    const fileExtension = file.name.substring(file.name.lastIndexOf('.')).toLowerCase();
+
+    if (!supportedTypes.includes(file.type) && !supportedExtensions.includes(fileExtension)) {
+      setError('Unsupported file type. Please select a .webm video file.');
+      return;
+    }
+
+    try {
+      setIsImporting(true);
+
+      const destFilename = fileNameOverride || `${chapter}_${verse}.webm`;
+      const destPath = path.join(projectPath, destFilename);
+
+      const arrayBuffer = await file.arrayBuffer();
+      const buffer = Buffer.from(arrayBuffer);
+      fs.writeFileSync(destPath, buffer);
+
+      if (onRecordingComplete) {
+        onRecordingComplete({
+          verse,
+          chapter,
+          filePath: destPath,
+          filename: destFilename,
+        });
+      }
+
+      setExistingVideo(true);
+      setCurrentMode('view');
+
+      setNotify('success');
+      setSnackText(`Video "${file.name}" imported successfully`);
+      setOpenSnackBar(true);
+
+      setTimeout(() => {
+        if (videoPreviewRef.current) {
+          const blob = new Blob([buffer], { type: file.type || 'video/mp4' });
+          const objectUrl = URL.createObjectURL(blob);
+
+          videoPreviewRef.current.pause();
+          videoPreviewRef.current.srcObject = null;
+          videoPreviewRef.current.removeAttribute('src');
+          videoPreviewRef.current.load();
+
+          videoPreviewRef.current.src = objectUrl;
+          videoPreviewRef.current.load();
+        }
+      }, 100);
+    } catch (err) {
+      setError(`Failed to import video: ${err.message}`);
+    } finally {
+      setIsImporting(false);
+    }
+  };
+
   const formatTime = (seconds) => {
     if (!Number.isFinite(seconds) || seconds <= 0) { return '00:00'; }
     const mins = Math.floor(seconds / 60);
@@ -272,10 +358,17 @@ const VideoRecorder = ({
   const hasNextVerse = () => getNextVerseNumber(verse, content) !== null;
 
   return (
-
     <div
       className={`fixed inset-0 bg-black bg-opacity-75 flex items-center justify-center z-[50] p-4 ${!isVisible ? 'hidden' : ''}`}
     >
+      <input
+        ref={importInputRef}
+        type="file"
+        accept=".webm,video/webm"
+        className="hidden"
+        onChange={handleImportFileChange}
+      />
+
       <div
         ref={containerRef}
         className={`bg-white shadow-2xl flex flex-col transition-all ${isFullscreen
@@ -301,6 +394,9 @@ const VideoRecorder = ({
               </h2>
               <p className="text-sm text-gray-200">
                 {(() => {
+                  if (isImporting) {
+                    return 'Importing video...';
+                  }
                   if (isRecording) {
                     return `${isPaused ? 'Paused' : 'Recording'}: ${formatTime(recordingTime)}`;
                   }
@@ -310,7 +406,6 @@ const VideoRecorder = ({
                   return 'Ready to record';
                 })()}
               </p>
-
             </div>
           </div>
 
@@ -318,12 +413,11 @@ const VideoRecorder = ({
             type="button"
             onClick={onClose}
             className="hover:bg-white hover:bg-opacity-20 p-2 rounded-full transition-colors"
-            disabled={isRecording}
+            disabled={isRecording || isImporting}
             title="Close"
           >
             <XMarkIcon className="w-5 h-5" />
           </button>
-
         </div>
 
         <div className={`flex-1 flex flex-col ${isFullscreen ? 'overflow-hidden' : 'overflow-auto'} p-2`}>
@@ -379,11 +473,11 @@ const VideoRecorder = ({
               </div>
             )}
 
-            {isProcessing && (
+            {(isProcessing || isImporting) && (
               <div className="absolute inset-0 flex items-center justify-center bg-gray-900 bg-opacity-90">
                 <div className="text-center text-white">
                   <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-white mx-auto mb-4" />
-                  <p>Saving video...</p>
+                  <p>{isImporting ? 'Importing video...' : 'Saving video...'}</p>
                 </div>
               </div>
             )}
@@ -520,7 +614,7 @@ const VideoRecorder = ({
                   )}
                 </button>
 
-                <div className="flex items-center gap-8">
+                <div className="flex items-center gap-4">
                   <button
                     type="button"
                     onClick={handlePreviousVerse}
@@ -596,23 +690,49 @@ const VideoRecorder = ({
                   </button>
                 </div>
 
-                {!hideDeleteButton && (
+                <div className="flex items-center gap-2">
+                  {!hideDeleteButton && (
+                    <button
+                      type="button"
+                      onClick={handleDeleteClick}
+                      disabled={!existingVideo || isRecording || isProcessing || isImporting}
+                      className={`p-4 rounded-full transition-all ${existingVideo
+                        ? 'bg-error text-white hover:bg-red-700'
+                        : 'bg-gray-300 text-gray-500 cursor-not-allowed'} 
+                        disabled:opacity-50 disabled:cursor-not-allowed`}
+                      title={existingVideo ? 'Delete recorded video' : 'No video to delete'}
+                    >
+                      <TrashIcon className="w-6 h-6" />
+                    </button>
+                  )}
+
+                </div>
+              </div>
+
+              <div className="flex items-center gap-2 w-44 justify-end">
+                <div className="relative group/import">
                   <button
                     type="button"
-                    onClick={handleDeleteClick}
-                    disabled={!existingVideo || isRecording || isProcessing}
-                    className={`p-4 rounded-full transition-all ${existingVideo
-                      ? 'bg-error text-white hover:bg-red-700'
-                      : 'bg-gray-300 text-gray-500 cursor-not-allowed'} 
-                      disabled:opacity-50 disabled:cursor-not-allowed`}
-                    title={existingVideo ? 'Delete recorded video' : 'No video to delete'}
+                    onClick={handleImportClick}
+                    disabled={isRecording || isProcessing || isImporting}
+                    className={`p-4 rounded-full transition-all transform hover:scale-105 disabled:opacity-50 disabled:cursor-not-allowed ${
+                      isImporting
+                        ? 'bg-blue-400 text-white cursor-wait'
+                        : 'bg-blue-600 hover:bg-blue-700 text-white'
+                    }`}
+                    title={(() => {
+                      if (isImporting) { return 'Importing...'; }
+                      if (existingVideo && !allowOverwriteExistingVideo) { return 'Video exists — delete it first to import'; }
+                      return 'Import video file';
+                    })()}
                   >
-                    <TrashIcon className="w-6 h-6" />
+                    {isImporting ? (
+                      <div className="animate-spin rounded-full h-6 w-6 border-b-2 border-white" />
+                    ) : (
+                      <ArrowDownTrayIcon className="w-5 h-5" />
+                    )}
                   </button>
-                )}
-              </div>
-
-              <div className="flex items-center gap-2 w-40 justify-end">
+                </div>
                 <button
                   type="button"
                   onClick={toggleFullscreen}
@@ -670,7 +790,6 @@ const VideoRecorder = ({
         </div>
       </div>
     </div>
-
   );
 };
 
@@ -713,7 +832,6 @@ VideoRecorder.defaultProps = {
   commentCount: 0,
   onOpenComments: null,
   showCommentsButton: false,
-
 };
 
 export default VideoRecorder;