diff --git a/src/frontend/src/components/nav/Layout.tsx b/src/frontend/src/components/nav/Layout.tsx
index d685a2c6ad..fdcbe6c578 100644
--- a/src/frontend/src/components/nav/Layout.tsx
+++ b/src/frontend/src/components/nav/Layout.tsx
@@ -1,8 +1,7 @@
-import { Container, Flex, LoadingOverlay, Space } from '@mantine/core';
+import { Container, Flex, Space } from '@mantine/core';
 import { Navigate, Outlet } from 'react-router-dom';
 
 import { InvenTreeStyle } from '../../globalStyle';
-import { useModalState } from '../../states/ModalState';
 import { useSessionState } from '../../states/SessionState';
 import { Footer } from './Footer';
 import { Header } from './Header';
@@ -20,12 +19,9 @@ export const ProtectedRoute = ({ children }: { children: JSX.Element }) => {
 export default function LayoutComponent() {
   const { classes } = InvenTreeStyle();
 
-  const modalState = useModalState();
-
   return (
     <ProtectedRoute>
       <Flex direction="column" mih="100vh">
-        <LoadingOverlay visible={modalState.loading} />
         <Header />
         <Container className={classes.layoutContent} size="100%">
           <Outlet />
diff --git a/src/frontend/src/functions/forms.tsx b/src/frontend/src/functions/forms.tsx
index eb46c51145..e2bbf57970 100644
--- a/src/frontend/src/functions/forms.tsx
+++ b/src/frontend/src/functions/forms.tsx
@@ -6,8 +6,8 @@ import { AxiosResponse } from 'axios';
 import { api } from '../App';
 import { ApiForm, ApiFormProps } from '../components/forms/ApiForm';
 import { ApiFormFieldType } from '../components/forms/fields/ApiFormField';
+import { StylishText } from '../components/items/StylishText';
 import { apiUrl } from '../states/ApiState';
-import { useModalState } from '../states/ModalState';
 import { invalidResponse, permissionDenied } from './notifications';
 import { generateUniqueId } from './uid';
 
@@ -98,10 +98,6 @@ export function openModalApiForm(props: ApiFormProps) {
 
   let url = constructFormUrl(props);
 
-  // let modalState = useModalState();
-
-  useModalState.getState().lock();
-
   // Make OPTIONS request first
   api
     .options(url)
@@ -122,7 +118,7 @@ export function openModalApiForm(props: ApiFormProps) {
       let modalId: string = `modal-${props.title}-` + generateUniqueId();
 
       modals.open({
-        title: props.title,
+        title: <StylishText>{props.title}</StylishText>,
         modalId: modalId,
         size: 'xl',
         onClose: () => {
@@ -132,12 +128,8 @@ export function openModalApiForm(props: ApiFormProps) {
           <ApiForm modalId={modalId} props={props} fieldDefinitions={fields} />
         )
       });
-
-      useModalState.getState().unlock();
     })
     .catch((error) => {
-      useModalState.getState().unlock();
-
       console.log('Error:', error);
       if (error.response) {
         invalidResponse(error.response.status);
diff --git a/src/frontend/src/states/ModalState.tsx b/src/frontend/src/states/ModalState.tsx
deleted file mode 100644
index 6c6e585102..0000000000
--- a/src/frontend/src/states/ModalState.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { create } from 'zustand';
-
-interface ModalStateProps {
-  loading: boolean;
-  lock: () => void;
-  unlock: () => void;
-}
-
-/**
- * Global state manager for modal forms.
- */
-export const useModalState = create<ModalStateProps>((set) => ({
-  loading: false,
-  lock: () => set(() => ({ loading: true })),
-  unlock: () => set(() => ({ loading: false }))
-}));