diff --git a/gui/rpk-gui/src/lib/crud/components/crud-form.tsx b/gui/rpk-gui/src/lib/crud/components/crud-form.tsx
index eb5ceac..ebb1e87 100644
--- a/gui/rpk-gui/src/lib/crud/components/crud-form.tsx
+++ b/gui/rpk-gui/src/lib/crud/components/crud-form.tsx
@@ -6,6 +6,7 @@ import { jsonschemaProvider } from "../providers/jsonschema-provider";
 import { useForm } from "@refinedev/core";
 import CrudTextWidget from "./widgets/crud-text-widget";
 import UnionEnumField from "./fields/union-enum";
+import { CircularProgress } from "@mui/material";
 
 type CrudFormProps = {
   schemaName: string,
@@ -54,6 +55,11 @@ export const CrudForm: React.FC<CrudFormProps> = (props) => {
     fetchSchema();
   }, []);
 
+
+  if(formLoading || loading) {
+    return <CircularProgress />
+  }
+
   return (
     <Form
       schema={schema}