diff --git a/.eslintignore b/.eslintignore
index f06235c4..a8c16873 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,2 +1,4 @@
 node_modules
 dist
+samples/*/dist
+samples/*/dist-tsc
diff --git a/src/extensible-areas/floating-window/component.ts b/src/extensible-areas/floating-window/component.ts
index 1215f3c0..4c7e07d2 100644
--- a/src/extensible-areas/floating-window/component.ts
+++ b/src/extensible-areas/floating-window/component.ts
@@ -19,6 +19,8 @@ export class FloatingWindow implements FloatingWindowInterface {
 
   boxShadow: string;
 
+  zIndex?: number;
+
   dataTest?: string;
 
   contentFunction: (element: HTMLElement) => ReactDOM.Root;
@@ -34,6 +36,7 @@ export class FloatingWindow implements FloatingWindowInterface {
    * @param movable - tells whether the floating window is movable or static.
    * @param backgroundColor - background color of the floating window.
    * @param boxShadow - box shadow to apply to the floating window
+   * @param zIndex - z-index of the floating window (Optional).
    * @param contentFunction - function that gives the html element to render the content of
    * the floating window. It must return the root element where the floating window was rendered.
    *
@@ -46,6 +49,7 @@ export class FloatingWindow implements FloatingWindowInterface {
     movable,
     backgroundColor,
     boxShadow,
+    zIndex,
     contentFunction,
     dataTest,
   }: FloatingWindowProps) {
@@ -58,6 +62,7 @@ export class FloatingWindow implements FloatingWindowInterface {
     this.dataTest = dataTest;
     this.backgroundColor = backgroundColor;
     this.boxShadow = boxShadow;
+    this.zIndex = zIndex;
 
     this.contentFunction = contentFunction;
     this.type = FloatingWindowType.CONTAINER;
diff --git a/src/extensible-areas/floating-window/types.ts b/src/extensible-areas/floating-window/types.ts
index 453dbe20..560d7d65 100644
--- a/src/extensible-areas/floating-window/types.ts
+++ b/src/extensible-areas/floating-window/types.ts
@@ -11,6 +11,7 @@ export interface FloatingWindowProps {
   movable: boolean;
   backgroundColor: string;
   boxShadow: string;
+  zIndex?: number;
   dataTest?: string;
   contentFunction: (element: HTMLElement) => ReactDOM.Root;
 }
diff --git a/src/utils/logger/logger.ts b/src/utils/logger/logger.ts
index 4cd498b4..6cd28f95 100644
--- a/src/utils/logger/logger.ts
+++ b/src/utils/logger/logger.ts
@@ -50,6 +50,7 @@ function logWith<T extends keyof Logger>(level: T, ...args: LoggerArgument[]): v
   try {
     method.call(logger, ...args);
   } catch (err) {
+    // eslint-disable-next-line no-console
     console.error(`[pluginLogger.${String(level)}] fallback`, err, ...args);
   }
 }