diff --git a/site/src/components/TemplateVersionEditor/TemplateVersionEditor.tsx b/site/src/components/TemplateVersionEditor/TemplateVersionEditor.tsx
index 73689d69a1e55..0bcaf8640adaa 100644
--- a/site/src/components/TemplateVersionEditor/TemplateVersionEditor.tsx
+++ b/site/src/components/TemplateVersionEditor/TemplateVersionEditor.tsx
@@ -89,6 +89,7 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
   const [createFileOpen, setCreateFileOpen] = useState(false)
   const [deleteFileOpen, setDeleteFileOpen] = useState<string>()
   const [renameFileOpen, setRenameFileOpen] = useState<string>()
+  const [dirty, setDirty] = useState(false)
   const [activePath, setActivePath] = useState<string | undefined>(() =>
     findInitialFile(fileTree),
   )
@@ -139,11 +140,11 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
     previousVersion.current = templateVersion
   }, [templateVersion])
 
-  const [dirty, setDirty] = useState(false)
   const hasIcon = template.icon && template.icon !== ""
   const templateVersionSucceeded = templateVersion.job.status === "succeeded"
   const showBuildLogs = Boolean(buildLogs)
   const editorValue = getFileContent(activePath ?? "", fileTree) as string
+  const firstTemplateVersionOnEditor = useRef(templateVersion)
 
   useEffect(() => {
     window.dispatchEvent(new Event("resize"))
@@ -170,9 +171,12 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
         </div>
 
         <div className={styles.topbarSides}>
-          <div className={styles.buildStatus}>
-            <TemplateVersionStatusBadge version={templateVersion} />
-          </div>
+          {/* Only start to show the build when a new template version is building */}
+          {templateVersion.id !== firstTemplateVersionOnEditor.current.id && (
+            <div className={styles.buildStatus}>
+              <TemplateVersionStatusBadge version={templateVersion} />
+            </div>
+          )}
 
           <Button
             title="Build template (Ctrl + Enter)"
@@ -387,7 +391,7 @@ const useStyles = makeStyles<
   {
     templateVersionSucceeded: boolean
     showBuildLogs: boolean
-    deploymentBannerVisible: boolean
+    deploymentBannerVisible?: boolean
   }
 >((theme) => ({
   root: {