diff --git a/web/src/pages/AddUpdatePipeline/AddUpdatePipeline.tsx b/web/src/pages/AddUpdatePipeline/AddUpdatePipeline.tsx
index f9d9caf46..299d36558 100644
--- a/web/src/pages/AddUpdatePipeline/AddUpdatePipeline.tsx
+++ b/web/src/pages/AddUpdatePipeline/AddUpdatePipeline.tsx
@@ -126,7 +126,7 @@ const AddUpdatePipeline = (): JSX.Element => {
 
   const {
     data: pipelineYAMLFileContent,
-    loading: resourceLoading,
+    loading: fetchingPipelineYAMLFileContent,
     refetch: fetchPipelineYAMLFileContent
   } = useGetResourceContent({
     repoMetadata,
@@ -134,39 +134,38 @@ const AddUpdatePipeline = (): JSX.Element => {
     resourcePath: pipelineData?.config_path || ''
   })
 
-  // check if file exists and has some content
-  useEffect(() => {
-    if (!resourceLoading) {
-      setIsExistingPipeline(!isEmpty(pipelineYAMLFileContent) && !isUndefined(pipelineYAMLFileContent.content))
-    }
-  }, [pipelineYAMLFileContent, resourceLoading])
+  const originalPipelineYAMLFileContent = useMemo(
+    (): string => decodeGitContent((pipelineYAMLFileContent?.content as RepoFileContent)?.data),
+    [pipelineYAMLFileContent?.content]
+  )
 
-  // to load initial content on the editor
+  // check if file already exists and has some content
+  useEffect(() => {
+    setIsExistingPipeline(!isEmpty(originalPipelineYAMLFileContent) && !isUndefined(originalPipelineYAMLFileContent))
+  }, [originalPipelineYAMLFileContent])
+
+  // load initial content on the editor
   useEffect(() => {
     if (isExistingPipeline) {
-      setPipelineAsYaml(decodeGitContent((pipelineYAMLFileContent?.content as RepoFileContent)?.data))
+      setPipelineAsYaml(originalPipelineYAMLFileContent)
     } else {
+      // load with starter pipeline
       try {
         setPipelineAsYaml(stringify(pipelineAsObj))
-      } catch (ex) {}
+      } catch (ex) {
+        // ignore exception
+      }
     }
-  }, [isExistingPipeline, pipelineYAMLFileContent])
+  }, [isExistingPipeline, originalPipelineYAMLFileContent, pipelineAsObj])
 
   // find if editor content was modified
   useEffect(() => {
-    if (isExistingPipeline) {
-      const originalContent = decodeGitContent((pipelineYAMLFileContent?.content as RepoFileContent)?.data)
-      setIsDirty(originalContent !== pipelineAsYAML)
-    } else {
-      setIsDirty(true)
-    }
-  }, [isExistingPipeline, pipelineAsYAML, pipelineYAMLFileContent])
+    setIsDirty(originalPipelineYAMLFileContent !== pipelineAsYAML)
+  }, [originalPipelineYAMLFileContent, pipelineAsYAML])
 
+  // set initial CTA title
   useEffect(() => {
-    if (isDirty) {
-      // enable "Save" option if pipeline is edited
-      setSelectedOption(pipelineSaveOption)
-    }
+    setSelectedOption(isDirty ? pipelineSaveAndRunOption : pipelineRunOption)
   }, [isDirty])
 
   const handleSaveAndRun = (option: PipelineSaveAndRunOption): void => {
@@ -191,6 +190,9 @@ const AddUpdatePipeline = (): JSX.Element => {
           .then(() => {
             fetchPipelineYAMLFileContent()
             showSuccess(getString(isExistingPipeline ? 'pipelines.updated' : 'pipelines.created'))
+            if (option?.action === PipelineSaveAndRunAction.SAVE_AND_RUN && repoMetadata && pipeline) {
+              openRunPipelineModal({ repoMetadata, pipeline })
+            }
             setSelectedOption(pipelineRunOption)
           })
           .catch(error => {
@@ -225,17 +227,6 @@ const AddUpdatePipeline = (): JSX.Element => {
 
   const renderCTA = useCallback(() => {
     switch (selectedOption?.action) {
-      case PipelineSaveAndRunAction.SAVE:
-        return (
-          <Button
-            variation={ButtonVariation.PRIMARY}
-            text={getString('save')}
-            onClick={() => {
-              handleSaveAndRun(pipelineSaveOption)
-            }}
-            disabled={loading || !isDirty}
-          />
-        )
       case PipelineSaveAndRunAction.RUN:
         return (
           <Button
@@ -248,8 +239,18 @@ const AddUpdatePipeline = (): JSX.Element => {
             }}
           />
         )
+      case PipelineSaveAndRunAction.SAVE:
       case PipelineSaveAndRunAction.SAVE_AND_RUN:
-        return (
+        return isExistingPipeline ? (
+          <Button
+            variation={ButtonVariation.PRIMARY}
+            text={getString('save')}
+            onClick={() => {
+              handleSaveAndRun(pipelineSaveOption)
+            }}
+            disabled={loading || !isDirty}
+          />
+        ) : (
           <SplitButton
             text={selectedOption?.title}
             disabled={loading || !isDirty}
@@ -260,7 +261,8 @@ const AddUpdatePipeline = (): JSX.Element => {
               position: PopoverPosition.BOTTOM_RIGHT,
               transitionDuration: 1000
             }}
-            intent="primary">
+            intent="primary"
+            onClick={() => handleSaveAndRun(selectedOption)}>
             {pipelineSaveAndRunOptions.map(option => {
               return (
                 <Menu.Item
@@ -271,7 +273,7 @@ const AddUpdatePipeline = (): JSX.Element => {
                     </Text>
                   }
                   onClick={() => {
-                    handleSaveAndRun(option)
+                    setSelectedOption(option)
                   }}
                 />
               )
@@ -281,7 +283,7 @@ const AddUpdatePipeline = (): JSX.Element => {
       default:
         return <></>
     }
-  }, [loading, fetchingPipeline, isDirty, repoMetadata, pipeline, selectedOption])
+  }, [loading, fetchingPipeline, isDirty, repoMetadata, pipeline, selectedOption, isExistingPipeline, pipelineAsYAML])
 
   return (
     <>
@@ -300,7 +302,7 @@ const AddUpdatePipeline = (): JSX.Element => {
           content={<Layout.Horizontal flex={{ justifyContent: 'space-between' }}>{renderCTA()}</Layout.Horizontal>}
         />
         <PageBody>
-          <LoadingSpinner visible={fetchingPipeline} />
+          <LoadingSpinner visible={fetchingPipeline || fetchingPipelineYAMLFileContent} />
           <Layout.Horizontal>
             <Container className={css.editorContainer}>
               <MonacoSourceCodeEditor
diff --git a/web/src/pages/AddUpdatePipeline/Constants.ts b/web/src/pages/AddUpdatePipeline/Constants.ts
index 4c1da545f..818dba710 100644
--- a/web/src/pages/AddUpdatePipeline/Constants.ts
+++ b/web/src/pages/AddUpdatePipeline/Constants.ts
@@ -2,3 +2,6 @@ export enum YamlVersion {
   V0,
   V1
 }
+
+export const DEFAULT_YAML_PATH_PREFIX = '.harness/'
+export const DEFAULT_YAML_PATH_SUFFIX = '.yaml'
diff --git a/web/src/pages/AddUpdatePipeline/NewPipelineModal.tsx b/web/src/pages/AddUpdatePipeline/NewPipelineModal.tsx
index e63c1ee85..1b10509dc 100644
--- a/web/src/pages/AddUpdatePipeline/NewPipelineModal.tsx
+++ b/web/src/pages/AddUpdatePipeline/NewPipelineModal.tsx
@@ -8,6 +8,7 @@ import type { OpenapiCreatePipelineRequest, TypesPipeline, TypesRepository } fro
 import { useStrings } from 'framework/strings'
 import { useAppContext } from 'AppContext'
 import { getErrorMessage } from 'utils/Utils'
+import { DEFAULT_YAML_PATH_PREFIX, DEFAULT_YAML_PATH_SUFFIX } from './Constants'
 
 interface FormData {
   name: string
@@ -76,28 +77,44 @@ const useNewPipelineModal = () => {
           validateOnChange
           validateOnBlur
           onSubmit={handleCreatePipeline}>
-          <FormikForm>
-            <Layout.Vertical spacing="small">
-              <Layout.Vertical spacing="small">
-                <FormInput.Text
-                  name="name"
-                  label={getString('name')}
-                  placeholder={getString('pipelines.enterPipelineName')}
-                  inputGroup={{ autoFocus: true }}
-                />
-                <FormInput.Text name="branch" label={getString('pipelines.basedOn')} />
-                <FormInput.Text
-                  name="yamlPath"
-                  label={getString('pipelines.yamlPath')}
-                  placeholder={getString('pipelines.enterYAMLPath')}
-                />
-              </Layout.Vertical>
-              <Layout.Horizontal spacing="medium" width="100%">
-                <Button variation={ButtonVariation.PRIMARY} text={getString('create')} type="submit" />
-                <Button variation={ButtonVariation.SECONDARY} text={getString('cancel')} onClick={onClose} />
-              </Layout.Horizontal>
-            </Layout.Vertical>
-          </FormikForm>
+          {formik => {
+            return (
+              <FormikForm>
+                <Layout.Vertical spacing="small">
+                  <Layout.Vertical spacing="small">
+                    <FormInput.Text
+                      name="name"
+                      label={getString('name')}
+                      placeholder={getString('pipelines.enterPipelineName')}
+                      inputGroup={{ autoFocus: true }}
+                      onChange={event => {
+                        const input = (event.target as HTMLInputElement)?.value
+                        formik?.setFieldValue('name', input)
+                        if (input) {
+                          // Keeping minimal validation for now, this could be much more exhaustive
+                          const path = input.trim().replace(/\s/g, '')
+                          formik?.setFieldValue(
+                            'yamlPath',
+                            DEFAULT_YAML_PATH_PREFIX.concat(path).concat(DEFAULT_YAML_PATH_SUFFIX)
+                          )
+                        }
+                      }}
+                    />
+                    <FormInput.Text name="branch" label={getString('pipelines.basedOn')} />
+                    <FormInput.Text
+                      name="yamlPath"
+                      label={getString('pipelines.yamlPath')}
+                      placeholder={getString('pipelines.enterYAMLPath')}
+                    />
+                  </Layout.Vertical>
+                  <Layout.Horizontal spacing="medium" width="100%">
+                    <Button variation={ButtonVariation.PRIMARY} text={getString('create')} type="submit" />
+                    <Button variation={ButtonVariation.SECONDARY} text={getString('cancel')} onClick={onClose} />
+                  </Layout.Horizontal>
+                </Layout.Vertical>
+              </FormikForm>
+            )
+          }}
         </Formik>
       </Dialog>
     )