diff --git a/client/src/components/profile/components/portfolio.tsx b/client/src/components/profile/components/portfolio.tsx
index e4f65d16210..c756b52639b 100644
--- a/client/src/components/profile/components/portfolio.tsx
+++ b/client/src/components/profile/components/portfolio.tsx
@@ -1,4 +1,4 @@
-import { findIndex, find, isEqual } from 'lodash-es';
+import { isEqual } from 'lodash-es';
 import { nanoid } from 'nanoid';
 import React, { useState } from 'react';
 import type { TFunction } from 'i18next';
@@ -18,18 +18,15 @@ import { PortfolioProjectData } from '../../../redux/prop-types';
 
 import { hasProtocolRE } from '../../../utils';
 
-import { FullWidthRow } from '../../helpers';
+import { FullWidthRow, interleave } from '../../helpers';
 import BlockSaveButton from '../../helpers/form/block-save-button';
 import SectionHeader from '../../settings/section-header';
 import { updateMyPortfolio } from '../../../redux/settings/actions';
 
 type PortfolioProps = {
-  picture?: string;
   portfolio: PortfolioProjectData[];
   t: TFunction;
   updateMyPortfolio: (obj: { portfolio: PortfolioProjectData[] }) => void;
-  username?: string;
-  setIsEditing: (isEditing: boolean) => void;
 };
 
 interface ProfileValidation {
@@ -53,17 +50,11 @@ function createEmptyPortfolioItem(): PortfolioProjectData {
   };
 }
 
-function createFindById(id: string) {
-  return (p: PortfolioProjectData) => p.id === id;
-}
+const byId = (id: string) => (p: PortfolioProjectData) => p.id === id;
+const notById = (id: string) => (p: PortfolioProjectData) => p.id !== id;
 
 const PortfolioSettings = (props: PortfolioProps) => {
-  const {
-    t,
-    portfolio: initialPortfolio = [],
-    setIsEditing,
-    updateMyPortfolio
-  } = props;
+  const { t, portfolio: initialPortfolio = [], updateMyPortfolio } = props;
   const [portfolio, setPortfolio] = useState(initialPortfolio);
   const [unsavedItemId, setUnsavedItemId] = useState<string | null>(null);
   const [imageValidation, setImageValid] = useState<ProfileValidation>({
@@ -87,34 +78,32 @@ const PortfolioSettings = (props: PortfolioProps) => {
     (e: React.ChangeEvent<HTMLInputElement>) => {
       e.preventDefault();
       const userInput = e.target.value.slice();
-      setPortfolio(prevPortfolio => {
-        const mutablePortfolio = [...prevPortfolio];
-        const index = findIndex(prevPortfolio, p => p.id === id);
-        mutablePortfolio[index] = {
-          ...mutablePortfolio[index],
-          [key]: userInput
-        };
-        if (key === 'image' && userInput) {
-          void checkIfValidImage(userInput).then(imageValidation => {
-            setImageValid(imageValidation);
-          });
-        } else if (key === 'image' && !userInput) {
+      setPortfolio(prevPortfolio =>
+        prevPortfolio.map(p => (byId(id)(p) ? { ...p, [key]: userInput } : p))
+      );
+      if (key === 'image') {
+        if (userInput) {
+          void checkIfValidImage(userInput).then(setImageValid);
+        } else {
           setImageValid({ state: 'success', message: '' });
         }
-        return mutablePortfolio;
-      });
+      }
     };
 
-  const updateItem = (
-    id: string,
-    updatedPortfolio?: PortfolioProjectData[]
-  ) => {
+  const saveItem = (id: string) => {
     if (unsavedItemId === id) {
       setUnsavedItemId(null);
     }
-    const portfolioToUpdate = updatedPortfolio || portfolio;
-    updateMyPortfolio({ portfolio: portfolioToUpdate });
-    setIsEditing(false);
+    const itemToSave = portfolio.find(byId(id));
+
+    if (itemToSave) {
+      const itemIndex = props.portfolio.findIndex(byId(id));
+      const updatedPortfolio =
+        itemIndex >= 0
+          ? props.portfolio.map(item => (byId(id)(item) ? itemToSave : item))
+          : [itemToSave, ...props.portfolio];
+      updateMyPortfolio({ portfolio: updatedPortfolio });
+    }
   };
 
   const handleAdd = () => {
@@ -124,18 +113,19 @@ const PortfolioSettings = (props: PortfolioProps) => {
   };
 
   const handleRemoveItem = (id: string) => {
-    const newPortfolio = portfolio.filter(p => p.id !== id);
-    setPortfolio(newPortfolio);
-    updateItem(id, newPortfolio);
-    setIsEditing(false);
+    setPortfolio(portfolio.filter(notById(id)));
+    if (unsavedItemId === id) {
+      setUnsavedItemId(null);
+    }
+    updateMyPortfolio({ portfolio: props.portfolio.filter(notById(id)) });
   };
 
   const isFormPristine = (id: string) => {
-    const original = find(props.portfolio, createFindById(id));
+    const original = props.portfolio.find(byId(id));
     if (!original) {
       return false;
     }
-    const edited = find(portfolio, createFindById(id));
+    const edited = portfolio.find(byId(id));
     return isEqual(original, edited);
   };
 
@@ -177,11 +167,10 @@ const PortfolioSettings = (props: PortfolioProps) => {
   const getUrlValidation = (
     url: string
   ): { state: 'success' | 'warning' | 'error'; message: string } => {
-    const len = url.length;
     if (!url) {
       return { state: 'success', message: '' };
     }
-    if (len >= 4 && !hasProtocolRE.test(url)) {
+    if (url.length >= 4 && !hasProtocolRE.test(url)) {
       return { state: 'error', message: t('validation.invalid-protocol') };
     }
     return isURL(url)
@@ -221,11 +210,7 @@ const PortfolioSettings = (props: PortfolioProps) => {
     };
   };
 
-  const renderPortfolio = (
-    portfolioItem: PortfolioProjectData,
-    index: number,
-    arr: PortfolioProjectData[]
-  ) => {
+  const renderPortfolio = (portfolioItem: PortfolioProjectData) => {
     const { id, title, description, url, image } = portfolioItem;
     const {
       isButtonDisabled,
@@ -235,21 +220,20 @@ const PortfolioSettings = (props: PortfolioProps) => {
       desc: { descriptionState, descriptionMessage },
       pristine
     } = formCorrect(portfolioItem);
-    const handleSubmit = (e: React.FormEvent<HTMLFormElement>, id: string) => {
+    const imageIsInvalid = imageValidation.state === 'error';
+    const saveDisabled = isButtonDisabled || pristine || imageIsInvalid;
+    const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
       e.preventDefault();
-      if (isButtonDisabled) return null;
-      setIsEditing(false);
-      return updateItem(id);
+      if (saveDisabled) return null;
+      return saveItem(id);
     };
     const combineImageStatus =
-      imageState === 'success' && imageValidation.state === 'success'
-        ? null
-        : 'error';
+      imageState === 'success' && !imageIsInvalid ? null : 'error';
     const combineImageMessage = imageMessage || imageValidation.message;
     return (
       <FullWidthRow key={id}>
         <form
-          onSubmit={e => handleSubmit(e, id)}
+          onSubmit={handleSubmit}
           id='portfolio-items'
           data-playwright-test-label='portfolio-items'
         >
@@ -338,10 +322,10 @@ const PortfolioSettings = (props: PortfolioProps) => {
             ) : null}
           </FormGroup>
           <BlockSaveButton
-            disabled={isButtonDisabled}
+            disabled={saveDisabled}
             bgSize='large'
             data-playwright-test-label='save-portfolio'
-            {...(isButtonDisabled && { tabIndex: -1 })}
+            {...(saveDisabled && { tabIndex: -1 })}
           >
             {t('buttons.save-portfolio')}
           </BlockSaveButton>
@@ -356,13 +340,6 @@ const PortfolioSettings = (props: PortfolioProps) => {
             {t('buttons.remove-portfolio')}
           </Button>
         </form>
-        {index + 1 !== arr.length && (
-          <>
-            <Spacer size='m' />
-            <hr />
-            <Spacer size='m' />
-          </>
-        )}
       </FullWidthRow>
     );
   };
@@ -385,7 +362,13 @@ const PortfolioSettings = (props: PortfolioProps) => {
         </Button>
       </FullWidthRow>
       <Spacer size='l' />
-      {portfolio.length ? portfolio.map(renderPortfolio) : null}
+      {interleave(portfolio.map(renderPortfolio), () => (
+        <>
+          <Spacer size='m' />
+          <hr />
+          <Spacer size='m' />
+        </>
+      ))}
     </section>
   );
 };
diff --git a/client/src/components/profile/profile.tsx b/client/src/components/profile/profile.tsx
index bfab2265513..9b72df3005e 100644
--- a/client/src/components/profile/profile.tsx
+++ b/client/src/components/profile/profile.tsx
@@ -61,7 +61,7 @@ const EditModal = ({ user, isEditing, setIsEditing }: EditModalProps) => {
         <Spacer size='m' />
         <Internet user={user} setIsEditing={setIsEditing} />
         <Spacer size='m' />
-        <Portfolio portfolio={portfolio} setIsEditing={setIsEditing} />
+        <Portfolio portfolio={portfolio} />
         <Spacer size='m' />
         <Experience experience={experience || []} />
       </Modal.Body>
diff --git a/e2e/portfolio.spec.ts b/e2e/portfolio.spec.ts
index c54a18234ac..4edfa288691 100644
--- a/e2e/portfolio.spec.ts
+++ b/e2e/portfolio.spec.ts
@@ -2,10 +2,10 @@ import { execSync } from 'child_process';
 import { test, expect } from '@playwright/test';
 import translations from '../client/i18n/locales/english/translations.json';
 
-test.use({ storageState: 'playwright/.auth/development-user.json' });
+test.use({ storageState: 'playwright/.auth/certified-user.json' });
 
 test.beforeAll(() => {
-  execSync('node ../tools/scripts/seed/seed-demo-user');
+  execSync('node ../tools/scripts/seed/seed-demo-user --certified-user');
 });
 
 test.afterAll(() => {
@@ -14,7 +14,7 @@ test.afterAll(() => {
 
 test.describe('Add Portfolio Item', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('/developmentuser');
+    await page.goto('/certifieduser');
 
     if (!process.env.CI) {
       await page
@@ -110,7 +110,9 @@ test.describe('Add Portfolio Item', () => {
       .fill('https://my-portfolio.com');
     await page
       .getByLabel(translations.settings.labels.image)
-      .fill('https://my-portfolio.com/image.png');
+      .fill(
+        'https://cdn.freecodecamp.org/universal/favicons/favicon-32x32.png'
+      );
     await page
       .getByLabel(translations.settings.labels.description)
       .fill('My description');
@@ -122,6 +124,14 @@ test.describe('Add Portfolio Item', () => {
     await expect(page.getByTestId('portfolio-items')).toBeHidden();
   });
 
+  test('The save button should be disabled when the form is pristine', async ({
+    page
+  }) => {
+    await expect(
+      page.getByRole('button', { name: 'Save this portfolio item' })
+    ).toBeDisabled();
+  });
+
   test('It should be possible to add a portfolio item', async ({ page }) => {
     await expect(
       page.getByRole('button', { name: 'Add a new portfolio Item' })
@@ -135,14 +145,53 @@ test.describe('Add Portfolio Item', () => {
       .fill('https://my-portfolio.com');
     await page
       .getByLabel(translations.settings.labels.image)
-      .fill('https://my-portfolio.com/image.png');
+      .fill(
+        'https://cdn.freecodecamp.org/universal/favicons/favicon-32x32.png'
+      );
     await page
       .getByLabel(translations.settings.labels.description)
       .fill('My description');
 
+    // Wait for async image validation to complete
+    await expect(
+      page.getByRole('button', { name: 'Save this portfolio item' })
+    ).toBeEnabled();
+
     await page
       .getByRole('button', { name: 'Save this portfolio item' })
       .click();
+    await page.getByRole('button', { name: 'Close' }).click();
+    await expect(page.getByRole('alert').first()).toContainText(
+      /We have updated your portfolio/
+    );
+  });
+
+  test('The edit modal should stay open after saving a portfolio item', async ({
+    page
+  }) => {
+    await page
+      .getByLabel(translations.settings.labels.title)
+      .first()
+      .fill('My portfolio');
+    await page
+      .getByLabel(translations.settings.labels.url)
+      .first()
+      .fill('https://my-portfolio.com');
+
+    // Wait for form validation to complete
+    await expect(
+      page.getByRole('button', { name: 'Save this portfolio item' }).first()
+    ).toBeEnabled();
+
+    await page
+      .getByRole('button', { name: 'Save this portfolio item' })
+      .first()
+      .click();
+
+    // Modal should still be open and portfolio form should be visible
+    await expect(page.getByTestId('portfolio-items').first()).toBeVisible();
+
+    await page.getByRole('button', { name: 'Close' }).click();
     await expect(page.getByRole('alert').first()).toContainText(
       /We have updated your portfolio/
     );