diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml
index f06028d45..cb89d2b91 100644
--- a/.github/workflows/frontend-admin-tests.yml
+++ b/.github/workflows/frontend-admin-tests.yml
@@ -137,7 +137,6 @@ jobs:
           pnpm exec playwright install
           pnpm exec playwright install-deps
           pnpm run test-admin
-          - uses: actions/upload-artifact@v4
       - uses: actions/upload-artifact@v4
         if: always()
         with:
diff --git a/.gitignore b/.gitignore
index ec9b3f151..7d65188e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ pnpm-lock.yaml
 /src/templates/admin
 /src/test-results
 playwright-report
+state.json
diff --git a/admin/src/utils/LoadingScreen.tsx b/admin/src/utils/LoadingScreen.tsx
index a234dfc38..b3ea51e13 100644
--- a/admin/src/utils/LoadingScreen.tsx
+++ b/admin/src/utils/LoadingScreen.tsx
@@ -5,7 +5,7 @@ export const LoadingScreen = ()=>{
     const showLoading = useStore(state => state.showLoading)
 
     return <Dialog.Root open={showLoading}><Dialog.Portal>
-        <Dialog.Overlay className="fixed inset-0 bg-black bg-opacity-50 z-50 dialog-overlay" />
+        <Dialog.Overlay className="loading-screen fixed inset-0 bg-black bg-opacity-50 z-50 dialog-overlay" />
         <Dialog.Content  className="fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 z-50 dialog-content">
             <div className="flex flex-col items-center">
                 <div className="animate-spin w-16 h-16 border-t-2 border-b-2 border-[--fg-color] rounded-full"></div>
diff --git a/src/tests/frontend-new/admin-spec/adminsettings.spec.ts b/src/tests/frontend-new/admin-spec/adminsettings.spec.ts
index b9e581725..8794eef90 100644
--- a/src/tests/frontend-new/admin-spec/adminsettings.spec.ts
+++ b/src/tests/frontend-new/admin-spec/adminsettings.spec.ts
@@ -49,10 +49,11 @@ test.describe('admin settings',()=> {
 
     test('restart works', async function ({page}) {
         await page.goto('http://localhost:9001/admin/settings');
+        await page.waitForSelector('.settings')
         await restartEtherpad(page)
         await page.waitForSelector('.settings')
         const settings =  page.locator('.settings');
         await expect(settings).not.toBeEmpty();
-        await page.waitForTimeout(1000)
+        await page.waitForSelector('.menu')
     });
 })
diff --git a/src/tests/frontend-new/helper/adminhelper.ts b/src/tests/frontend-new/helper/adminhelper.ts
index 66bb5336f..d6b5d5615 100644
--- a/src/tests/frontend-new/helper/adminhelper.ts
+++ b/src/tests/frontend-new/helper/adminhelper.ts
@@ -1,9 +1,4 @@
-import {Page} from "@playwright/test";
-
-export const goToAdminPage = async (page: Page) => {
-
-}
-
+import {expect, Page} from "@playwright/test";
 
 export const loginToAdmin = async (page: Page, username: string, password: string) => {
 
@@ -24,7 +19,14 @@ export const saveSettings = async (page: Page) => {
 
 export const restartEtherpad = async (page: Page) => {
     // Click restart
-    await page.locator('.settings-button-bar').locator('button').nth(1).click()
-    await page.waitForTimeout(100)
+    const restartButton = page.locator('.settings-button-bar').locator('.settingsButton').nth(1)
+    const settings =  page.locator('.settings');
+    await expect(settings).not.toBeEmpty();
+    await expect(restartButton).toBeVisible()
+    await page.locator('.settings-button-bar')
+        .locator('.settingsButton')
+        .nth(1)
+        .click()
+    await page.waitForTimeout(500)
     await page.waitForSelector('.settings')
 }