@@ -7,21 +7,13 @@ See Plugin [README](https://github.com/NotePlan/plugins/blob/main/dwertheimer.Fo
 ## [1.0.12] 2026-01-17 @dwertheimer
 
 ### Added
-- **EventChooser Preloading**: Added support for preloading events data when `preloadChooserData: true` is set in form frontmatter
-- **All Choosers Support Preloading**: All chooser types (FolderChooser, NoteChooser, SpaceChooser, MentionChooser, TagChooser, EventChooser) now support preloading data for static HTML testing
 
 ### Fixed
-- Fixed chooser width wrapping in compact mode - removed `min-width` for percentage and viewport unit widths to prevent wrapping issues
-- Choosers with `width="100%"` or other percentage/viewport units now properly respect container boundaries without wrapping
 
 ### Changed
-- **SearchableChooser**: Width prop now only sets `min-width` for fixed pixel values, allowing flexible sizing for percentages and viewport units
-- **Code Refactoring**: Refactored `getPluginData` function into smaller, modular helper functions for better maintainability:
-  - `detectFieldRequirements()` - Detects which chooser types are needed
-  - `ensureAutosaveField()` - Adds autosave field if needed
-  - `preloadAllChooserData()` - Orchestrates all preloading operations
-  - Individual preload functions for each chooser type (folders, notes, teamspaces, mentions, hashtags, events)
-  - `initializeEmptyChooserData()` - Initializes empty arrays when not preloading
+- **FormView**: Set text color of dialog to main color for better readability
+Under the hood changes to move all window opening code to the windowManagement.js file.
+
 
 ## [1.0.11] 2026-01-17 @dwertheimer
 
 
@@ -59,6 +59,12 @@
       ],
       "description": "Browse and select template forms in a two-column resizable layout",
       "jsFunction": "openFormBrowser",
+      "sidebarView": {
+        "windowID": "form-browser-window main",
+        "title": "Form Browser",
+        "icon": "list",
+        "iconColor": "blue-500"
+      },
       "arguments": [
         {
           "name": "showFloating",
 
@@ -17,7 +17,6 @@ import { getNoteByFilename } from '@helpers/note'
 import { validateObjectString, parseObjectString } from '@helpers/stringTransforms'
 import { updateFrontMatterVars, ensureFrontmatter, noteHasFrontMatter, getFrontmatterAttributes } from '@helpers/NPFrontMatter'
 import { loadCodeBlockFromNote } from '@helpers/codeBlocks'
-import { generateCSSFromTheme } from '@helpers/NPThemeToCSS'
 import { parseTeamspaceFilename } from '@helpers/teamspace'
 import { getFolderFromFilename } from '@helpers/folders'
 import { displayTitle } from '@helpers/paragraph'
@@ -806,89 +805,7 @@ export async function openFormBuilder(templateTitle?: string): Promise<void> {
  */
 // openFormWindow is now imported from windowManagement.js
 
-/**
- * Open Form Browser window - browse and select template forms
- * @param {Object} argObj - Options object
- * @param {boolean} argObj.showFloating - If true, use showReactWindow instead of showInMainWindow
- * @returns {Promise<void>}
- */
-export async function openFormBrowser(_showFloating: boolean = false): Promise<void> {
-  try {
-    logDebug(pluginJson, `openFormBrowser: Starting, showFloating=${String(_showFloating)}`)
-
-    // Make sure we have np.Shared plugin which has the core react code
-    await DataStore.installOrUpdatePluginsByID(['np.Shared'], false, false, true)
-    logDebug(pluginJson, `openFormBrowser: installOrUpdatePluginsByID ['np.Shared'] completed`)
-
-    const startTime = new Date()
-    const ENV_MODE = 'development'
-    const showFloating = _showFloating === true || (typeof _showFloating === 'string' && /true/i.test(_showFloating))
-
-    // Create plugin data
-    // Note: requestFromPlugin is now implemented in FormBrowserView using the dispatch pattern
-    // (functions can't be serialized when passed through HTML/JSON)
-    // Generate unique window ID based on whether it's floating or main window
-    const windowId = showFloating ? getFormBrowserWindowId('floating') : getFormBrowserWindowId('main')
-    const pluginData = {
-      platform: NotePlan.environment.platform,
-      windowId: windowId, // Store window ID in pluginData so React can send it in requests
-      showFloating: showFloating, // Pass showFloating flag so React knows whether to show header
-    }
-
-    // Create data object to pass to React
-    const dataToPass: PassedData = {
-      pluginData,
-      title: 'Form Browser',
-      logProfilingMessage: false,
-      debug: false, // Enable debug mode to show test buttons
-      ENV_MODE,
-      returnPluginCommand: { id: pluginJson['plugin.id'], command: 'onFormBrowserAction' },
-      componentPath: `../dwertheimer.Forms/react.c.FormBrowserView.bundle.dev.js`,
-      startTime,
-    }
-
-    // CSS tags for styling
-    const cssTagsString = `
-      <link rel="stylesheet" href="../np.Shared/css.w3.css">
-      <link href="../np.Shared/fontawesome.css" rel="stylesheet">
-      <link href="../np.Shared/regular.min.flat4NP.css" rel="stylesheet">
-      <link href="../np.Shared/solid.min.flat4NP.css" rel="stylesheet">
-      <link href="../np.Shared/light.min.flat4NP.css" rel="stylesheet">\n`
-
-    // Use the same windowOptions for both floating and main window
-    const windowOptions = {
-      savedFilename: `../../${pluginJson['plugin.id']}/form_browser_output.html`,
-      headerTags: cssTagsString,
-      windowTitle: 'Form Browser',
-      width: 1200,
-      height: 800,
-      customId: windowId, // Use unique window ID instead of constant
-      shouldFocus: true,
-      generalCSSIn: generateCSSFromTheme(),
-      postBodyScript: `
-        <script type="text/javascript" >
-        // Set DataStore.settings so default logDebug etc. logging works in React
-        let DataStore = { settings: {_logLevel: "${DataStore.settings._logLevel}" } };
-        </script>
-      `,
-      // Options for showInMainWindow (main window mode)
-      splitView: false,
-      icon: 'list',
-      iconColor: 'blue-500',
-      autoTopPadding: true,
-    }
-
-    // Choose the appropriate command based on whether it's floating or main window
-    const windowType = showFloating ? 'openReactWindow' : 'showInMainWindow'
-    logDebug(pluginJson, `openFormBrowser: Using ${windowType} (${showFloating ? 'floating' : 'main'} window)`)
-    await DataStore.invokePluginCommandByName(windowType, 'np.Shared', [dataToPass, windowOptions])
-
-    logDebug(pluginJson, `openFormBrowser: Completed after ${timer(startTime)}`)
-  } catch (error) {
-    logError(pluginJson, `openFormBrowser: Error: ${JSP(error)}`)
-    await showMessage(`Error opening form browser: ${error.message}`)
-  }
-}
+// openFormBrowser is now imported from windowManagement.js
 
 /**
  * Plugin entrypoint for triggerOpenForm
 
@@ -7,6 +7,13 @@
 /* Template Form Dialog Centering - apply same centering logic as DynamicDialog.css */
 /* Only apply centering if no explicit x,y positioning is set via inline styles */
 .dynamic-dialog.template-form {
+
+  /* set the text color of the dialog to the main color */
+  color: var(--fg-main-color);
+  & input, & textarea, & select {
+    color: var(--fg-main-color);
+  }
+
   /* Ensure proper vertical centering - same as DynamicDialog.css */
   /* Center vertically: position top edge at viewport center + toolbar offset, then translateY(-50%) centers it */
   /* Account for toolbar offset: center of available space = 50vh + toolbar-height/2 */
@@ -618,3 +625,48 @@
   word-wrap: break-word;
   overflow-wrap: break-word;
 }
+
+/* Form Submitting Overlay */
+/* Positioned at root level to appear above all content including modals */
+.form-submitting-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.6); /* Slightly darker for better visibility */
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 99999 !important; /* Very high z-index to appear above everything (modals are 100-101) */
+  pointer-events: auto; /* Block all interactions during submission */
+}
+
+.form-submitting-message {
+  background-color: var(--tint-color, #007aff);
+  color: white;
+  padding: 1.5rem 2.5rem;
+  border-radius: 12px;
+  font-size: 1.2rem;
+  font-weight: 600;
+  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.4);
+  animation: pulse 2s ease-in-out infinite;
+  text-align: center;
+  pointer-events: auto; /* Make message interactive (though not needed) */
+  min-width: 250px;
+  max-width: 90vw;
+}
+
+.form-submitting-message > div {
+  display: block;
+  line-height: 1.5;
+}
+
+@keyframes pulse {
+  0%, 100% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0.8;
+  }
+}
@@ -32,6 +32,7 @@ type Props = {
  ****************************************************************************************************************************/
 
 import React, { useEffect, useRef, useState, useCallback, useMemo, type Node } from 'react'
+import { createPortal } from 'react-dom'
 import { type PassedData } from '../shared/types.js'
 import { AppProvider } from './AppContext.jsx'
 import DynamicDialog from '@helpers/react/DynamicDialog'
@@ -422,22 +423,47 @@ export function FormView({ data, dispatch, reactSettings, setReactSettings, onSu
   }
 
   const handleCancel = () => {
+    setIsSubmitting(false) // Hide overlay if canceling during submission
+    setFormSubmitted(false) // Reset submitted state
     sendActionToPlugin(onSubmitOrCancelCallFunctionNamed, { type: 'cancel' })
     closeDialog()
   }
 
   // Track if form was submitted to handle delayed closing
   const [formSubmitted, setFormSubmitted] = useState<boolean>(false)
+  // Track if form is currently submitting (for showing loading overlay)
+  const [isSubmitting, setIsSubmitting] = useState<boolean>(false)
+  
+  // Debug counters (visible on-screen during freeze)
+  // Use refs for counters to avoid re-renders, only update state when needed (e.g., during submission)
+  const debugCountersRef = useRef<{ renders: number, setDataReceived: number, handleSaveCalls: number }>({ renders: 0, setDataReceived: 0, handleSaveCalls: 0 })
+  const [debugCounters, setDebugCounters] = useState({ renders: 0, setDataReceived: 0, handleSaveCalls: 0 })
+  const handleSaveCallCountRef = useRef<number>(0)
+  const setDataReceivedCountRef = useRef<number>(0)
 
   // Close dialog after submission if there's no AI analysis result
+  // GUARD: Use ref to prevent this effect from running multiple times with same data
+  const formSubmittedEffectRunRef = useRef<string>('')
   useEffect(() => {
     if (formSubmitted) {
+      // Create a signature for this effect run to prevent duplicate processing
+      const signature = `${String(!!pluginData?.aiAnalysisResult)}-${String(!!pluginData?.formSubmissionError)}`
+      if (formSubmittedEffectRunRef.current === signature) {
+        // Already processed this state, skip to prevent loops
+        return
+      }
+      formSubmittedEffectRunRef.current = signature
       // Check if there's an AI analysis result
       const hasAiAnalysis = pluginData?.aiAnalysisResult && typeof pluginData.aiAnalysisResult === 'string' && pluginData.aiAnalysisResult.includes('==**Templating Error Found**')
       logDebug('FormView', `[AI ANALYSIS] formSubmitted=${String(formSubmitted)}, hasAiAnalysis=${String(hasAiAnalysis)}, aiAnalysisResult exists=${String(!!pluginData?.aiAnalysisResult)}, length=${pluginData?.aiAnalysisResult?.length || 0}`)
 
       const hasFormSubmissionError = pluginData?.formSubmissionError && typeof pluginData.formSubmissionError === 'string'
 
+      // Hide submitting overlay if we received an error or AI analysis result
+      if (hasAiAnalysis || hasFormSubmissionError) {
+        setIsSubmitting(false)
+      }
+      
       if (!hasAiAnalysis && !hasFormSubmissionError) {
         // No AI analysis result and no form submission error - close the dialog after a short delay to allow data to update
         logDebug('FormView', `[AI ANALYSIS] No AI analysis result, no form submission error, will close dialog after 500ms delay`)
@@ -447,6 +473,7 @@ export function FormView({ data, dispatch, reactSettings, setReactSettings, onSu
           const stillNoFormError = !pluginData?.formSubmissionError
           logDebug('FormView', `[AI ANALYSIS] After 500ms delay, stillNoAiAnalysis=${String(stillNoAiAnalysis)}, stillNoFormError=${String(stillNoFormError)}, closing dialog`)
           if (stillNoAiAnalysis && stillNoFormError) {
+            setIsSubmitting(false) // Hide overlay before closing
             closeDialog()
             setFormSubmitted(false)
           }
@@ -461,8 +488,22 @@ export function FormView({ data, dispatch, reactSettings, setReactSettings, onSu
   }, [formSubmitted, pluginData?.aiAnalysisResult, pluginData?.formSubmissionError])
 
   const handleSave = (formValues: Object, windowId?: string) => {
+    // GUARD: Prevent multiple submissions (critical for preventing loops)
+    if (isSubmitting || formSubmitted) {
+      logDebug('FormView', `[GUARD] handleSave: Already submitting (isSubmitting=${String(isSubmitting)}, formSubmitted=${String(formSubmitted)}), ignoring duplicate call`)
+      return
+    }
+    
+    handleSaveCallCountRef.current += 1
+    debugCountersRef.current.handleSaveCalls = handleSaveCallCountRef.current
+    // Update state to show in overlay
+    setDebugCounters({ ...debugCountersRef.current })
+    
     clo(formValues, 'DynamicDialog: handleSave: formValues')
+    logDebug('FormView', `[FRONT-END] handleSave called (#${handleSaveCallCountRef.current}) - form submission starting, isSubmitting=${String(isSubmitting)}, formSubmitted=${String(formSubmitted)}`)
     setFormSubmitted(true) // Mark form as submitted
+    setIsSubmitting(true) // Show submitting overlay
+    logDebug('FormView', `[FRONT-END] Sending onSubmitClick to back-end (plugin)`)
     sendActionToPlugin(onSubmitOrCancelCallFunctionNamed, {
       type: 'submit',
       formValues,
@@ -677,19 +718,41 @@ export function FormView({ data, dispatch, reactSettings, setReactSettings, onSu
   // Diagnostic: Log render timing (runs on every render to track re-renders)
   // Note: Re-renders from autosave completion are expected (autosave updates state → re-render)
   const renderCountRef = useRef<number>(0)
+  const lastPluginDataRef = useRef<string>('')
   useEffect(() => {
     renderCountRef.current += 1
     const renderStartTime = performance.now()
+    
+    // Track pluginData changes to detect SET_DATA messages from back-end
+    const currentPluginDataStr = JSON.stringify(pluginData)
+    const pluginDataChanged = currentPluginDataStr !== lastPluginDataRef.current
+    if (pluginDataChanged) {
+      lastPluginDataRef.current = currentPluginDataStr
+      setDataReceivedCountRef.current += 1
+      debugCountersRef.current.setDataReceived = setDataReceivedCountRef.current
+      // Don't update state here - would cause infinite loop. Only update when handleSave is called.
+      logDebug('FormView', `[FRONT-END] SET_DATA received from back-end (#${setDataReceivedCountRef.current}) - pluginData changed, triggering re-render #${renderCountRef.current}`)
+      // Log what changed
+      const hasError = pluginData?.formSubmissionError || pluginData?.aiAnalysisResult
+      if (hasError) {
+        logDebug('FormView', `[FRONT-END] SET_DATA contains error: formSubmissionError=${!!pluginData?.formSubmissionError}, aiAnalysisResult=${!!pluginData?.aiAnalysisResult}`)
+      }
+    }
+    
+    // Update render counter in ref only (don't trigger state update - that would cause infinite loop!)
+    debugCountersRef.current.renders = renderCountRef.current
+    
     // Only log first few renders and then periodically to reduce noise
-    const shouldLog = renderCountRef.current <= 3 || renderCountRef.current % 10 === 0
+    // But always log when pluginData changes (back-end activity)
+    const shouldLog = pluginDataChanged || renderCountRef.current <= 3 || renderCountRef.current % 10 === 0
     if (shouldLog) {
-      logDebug('FormView', `[DIAG] FormView RENDER #${renderCountRef.current}: formFields=${formFields.length}, folders=${folders.length}, notes=${notes.length}`)
+      logDebug('FormView', `[FRONT-END] FormView RENDER #${renderCountRef.current}: formFields=${formFields.length}, folders=${folders.length}, notes=${notes.length}, pluginDataChanged=${String(pluginDataChanged)}`)
     }
 
     requestAnimationFrame(() => {
       const renderElapsed = performance.now() - renderStartTime
       if (shouldLog) {
-        logDebug('FormView', `[DIAG] FormView RENDER #${renderCountRef.current} AFTER RAF: elapsed=${renderElapsed.toFixed(2)}ms`)
+        logDebug('FormView', `[FRONT-END] FormView RENDER #${renderCountRef.current} AFTER RAF: elapsed=${renderElapsed.toFixed(2)}ms`)
       }
     })
   })
@@ -760,6 +823,7 @@ export function FormView({ data, dispatch, reactSettings, setReactSettings, onSu
   }, [formSubmissionError])
 
   return (
+    <>
     <AppProvider
       sendActionToPlugin={sendActionToPlugin}
       sendToPlugin={sendToPlugin}
@@ -856,6 +920,37 @@ export function FormView({ data, dispatch, reactSettings, setReactSettings, onSu
         </div>
         {/* end of replace */}
       </div>
+      {/* Submitting overlay - rendered via portal to document.body to appear above everything */}
+      {isSubmitting && typeof document !== 'undefined' && document.body
+        ? createPortal(
+            <div className="form-submitting-overlay">
+              <div className="form-submitting-message">
+                <div>Submitting Form...</div>
+                {/* Debug counters visible during freeze - read from ref to avoid triggering re-renders */}
+                <div style={{ marginTop: '1rem', fontSize: '0.9rem', opacity: 0.8 }}>
+                  Renders: {debugCountersRef.current.renders} | SET_DATA: {debugCountersRef.current.setDataReceived} | handleSave: {debugCountersRef.current.handleSaveCalls}
+                </div>
+              </div>
+            </div>,
+            document.body,
+          )
+        : null}
     </AppProvider>
+    {/* Submitting overlay - rendered via portal to document.body to appear above everything */}
+    {isSubmitting && typeof document !== 'undefined' && document.body
+      ? createPortal(
+          <div className="form-submitting-overlay">
+            <div className="form-submitting-message">
+              <div>Submitting Form...</div>
+              {/* Debug counters visible during freeze - read from ref to avoid triggering re-renders */}
+              <div style={{ marginTop: '1rem', fontSize: '0.9rem', opacity: 0.8 }}>
+                Renders: {debugCountersRef.current.renders} | SET_DATA: {debugCountersRef.current.setDataReceived} | handleSave: {debugCountersRef.current.handleSaveCalls}
+              </div>
+            </div>
+          </div>,
+          document.body,
+        )
+      : null}
+    </>
   )
 }