diff --git a/frontend/playwright/ui/pages/WorkspacePage.js b/frontend/playwright/ui/pages/WorkspacePage.js
index 3baa3ece1..4eac37d7f 100644
--- a/frontend/playwright/ui/pages/WorkspacePage.js
+++ b/frontend/playwright/ui/pages/WorkspacePage.js
@@ -50,9 +50,9 @@ export class WorkspacePage extends BaseWebSocketPage {
     this.layers = page.getByTestId("layer-tree");
     this.palette = page.getByTestId("palette");
     this.sidebar = page.getByTestId("left-sidebar");
-    this.librariesModal = page.getByTestId("libraries-modal");
     this.selectionRect = page.getByTestId("workspace-selection-rect");
     this.horizontalScrollbar = page.getByTestId("horizontal-scrollbar");
+    this.librariesModal = page.getByTestId("libraries-modal");
   }
 
   async goToWorkspace({ fileId = WorkspacePage.anyFileId, pageId = WorkspacePage.anyPageId } = {}) {
@@ -160,4 +160,10 @@ export class WorkspacePage extends BaseWebSocketPage {
   async clickColorPalette(clickOptions = {}) {
     await this.palette.getByRole("button", { name: "Color Palette (Alt+P)" }).click(clickOptions);
   }
+
+  async clickColorPalette(clickOptions = {}) {
+    await this.palette
+      .getByRole("button", { name: "Color Palette (Alt+P)" })
+      .click(clickOptions);
+  }
 }
diff --git a/frontend/playwright/ui/specs/workspace.spec.js b/frontend/playwright/ui/specs/workspace.spec.js
index 2800163b2..3682ecf68 100644
--- a/frontend/playwright/ui/specs/workspace.spec.js
+++ b/frontend/playwright/ui/specs/workspace.spec.js
@@ -92,3 +92,31 @@ test("Bug 7525 - User moves a scrollbar and no selciont rectangle appears", asyn
 
   await expect(workspacePage.selectionRect).not.toBeInViewport();
 });
+
+test("User adds a library and its automatically selected in the color palette", async ({ page }) => {
+  const workspacePage = new WorkspacePage(page);
+  await workspacePage.setupEmptyFile();
+  await workspacePage.mockRPC("link-file-to-library", "workspace/link-file-to-library.json");
+  await workspacePage.mockRPC("unlink-file-from-library", "workspace/unlink-file-from-library.json");
+  await workspacePage.mockRPC("get-team-shared-files?team-id=*", "workspace/get-team-shared-libraries-non-empty.json");
+  
+  await workspacePage.goToWorkspace();
+
+  // Add Testing library 1
+  await workspacePage.clickColorPalette();
+  await workspacePage.clickAssets();
+  // Now the get-file call should return a library
+  await workspacePage.mockRPC(/get\-file\?/, "workspace/get-file-library.json");
+  await workspacePage.openLibrariesModal();
+  await workspacePage.clickLibrary("Testing library 1")
+  await workspacePage.closeLibrariesModal(); 
+
+  await expect(workspacePage.palette.getByRole("button", { name: "test-color-187cd5" })).toBeVisible();
+
+  // Remove Testing library 1
+  await workspacePage.openLibrariesModal();
+  await workspacePage.clickLibrary("Testing library 1")
+  await workspacePage.closeLibrariesModal();
+
+  await expect(workspacePage.palette.getByText('There are no color styles in your library yet')).toBeVisible();
+});
diff --git a/frontend/src/app/main/ui/components/tab_container.cljs b/frontend/src/app/main/ui/components/tab_container.cljs
index 20c79a417..1e3b99079 100644
--- a/frontend/src/app/main/ui/components/tab_container.cljs
+++ b/frontend/src/app/main/ui/components/tab_container.cljs
@@ -59,6 +59,7 @@
            [:div {:key (str/concat "tab-" sid)
                   :title tooltip
                   :data-id sid
+                  :data-testid sid
                   :on-click on-click
                   :class  (stl/css-case
                            :tab-container-tab-title true
diff --git a/frontend/src/app/main/ui/workspace/libraries.cljs b/frontend/src/app/main/ui/workspace/libraries.cljs
index 6d5813c0d..5e354e423 100644
--- a/frontend/src/app/main/ui/workspace/libraries.cljs
+++ b/frontend/src/app/main/ui/workspace/libraries.cljs
@@ -519,7 +519,8 @@
      [:div {:class (stl/css :modal-dialog)}
       [:button {:class (stl/css :close-btn)
                 :on-click close-dialog
-                :aria-label (tr "labels.close")}
+                :aria-label (tr "labels.close")
+                :data-testid "close-libraries"}
        close-icon]
       [:div {:class (stl/css :modal-title)}
        (tr "workspace.libraries.libraries")]