diff --git a/src/components/Dashboard/common/TemplateEditor.jsx b/src/components/Dashboard/common/TemplateEditor.jsx
index b0a5719a..c02b8e69 100644
--- a/src/components/Dashboard/common/TemplateEditor.jsx
+++ b/src/components/Dashboard/common/TemplateEditor.jsx
@@ -187,22 +187,24 @@ const TemplateEditor = ({
       <Splitter className={'farmcontrol-splitter'} vertical={true}>
         {collapseState.preview == true && (
           <Splitter.Panel style={{ height: '100%' }}>
-            <Card
-              spinning={loading}
-              style={style}
-              styles={{ body: { height: '100%', padding: '22px' } }}
-            >
-              <TemplatePreview
-                objectData={objectData?.testObject}
-                documentTemplate={objectData}
-                loading={loading}
-                isEditing={isEditing}
+            <Spin spinning={loading} indicator={<LoadingOutlined />}>
+              <Card
+                spinning={loading}
                 style={style}
-                onTestObjectOpen={() => setTestObjectOpen(true)}
-                onPreviewMessage={handlePreviewMessage}
-                showTestObject={true}
-              />
-            </Card>
+                styles={{ body: { height: '100%', padding: '22px' } }}
+              >
+                <TemplatePreview
+                  objectData={objectData?.testObject}
+                  documentTemplate={objectData}
+                  loading={loading}
+                  isEditing={isEditing}
+                  style={style}
+                  onTestObjectOpen={() => setTestObjectOpen(true)}
+                  onPreviewMessage={handlePreviewMessage}
+                  showTestObject={true}
+                />
+              </Card>
+            </Spin>
           </Splitter.Panel>
         )}
         {collapseState.editor == true && (